diff --git a/App.vue b/App.vue
index 59cc84a..23d4274 100644
--- a/App.vue
+++ b/App.vue
@@ -8,7 +8,7 @@
 		// 优先于show方法
 		onLaunch: function() {
 			// 配置全局域名
-			uni.setStorageSync('hostapi','https://peili.scdxtc.cn'); 
+			uni.setStorageSync('hostapi','http://maintain.7and5.cn'); 
 			// 设置主色调
 			uni.setStorageSync('publicColor','#000000');
 		},
@@ -30,9 +30,13 @@
 	@import url("./commons/icon-font.css");
 	/* 阿里巴巴矢量图标库 end */
 	
-	/* 项目主体样式 start */
+	/* 项目基础样式 start */
 	@import url("./commons/base.css");
-	/* 项目主体样式 end */
+	/* 项目基础样式 end */
+	
+	/* 项目页面样式 start */
+	@import url("./commons/flying-monkey.css");
+	/* 项目页面样式 end */
 	
 	/* 动画样式 start */
 	@import url("./commons/animate.min.css");
diff --git a/commons/flying-monkey.css b/commons/flying-monkey.css
new file mode 100644
index 0000000..eb72d0a
--- /dev/null
+++ b/commons/flying-monkey.css
@@ -0,0 +1,58 @@
+/* 注册页面 */
+.register-close {width: 26rpx;height: 25rpx;}
+.register-title {color: #03affb;}
+.register-phone-img{
+	width: 0;
+	height: 0;
+	border-left: 8rpx solid transparent;
+	border-top: 10rpx solid #000;
+	border-right: 8rpx solid transparent;
+	margin: 0 20rpx 0 10rpx;
+}
+.clear-input {
+	width: 100%;
+	border: none;
+	border-bottom: 1rpx solid #d9d9d9;
+	font-weight: 400;
+	font-size: 24rpx;
+	box-sizing: border-box;
+	height: 66rpx;
+	padding-right: 60rpx;
+}
+.obtain-code {
+	flex-shrink: 0;
+	border: 1rpx solid #03affb;
+	color: #03affb;
+	height: 45rpx;
+	line-height: 45rpx;
+	border-radius: 24rpx;
+	padding: 4rpx 20rpx;
+	margin-left: 20rpx;
+}
+.placeholderColor {color: #bfbfbf;}
+.register-radio {transform: scale(0.5);margin-left: -10rpx;margin-right: -10rpx;}
+uni-radio .uni-radio-input {border: 1rpx solid #444444;}
+.register-agree-policy {color: #03affb;}
+.register-btn {width: 422rpx;height: 76rpx;line-height: 76rpx;text-align: center;margin: 0 auto;border-radius: 76rpx;margin-top: 60rpx; background-color: #03affb;color: #FFFFFF;}
+.clear-box {
+	position: absolute;right: 0;
+	top: 50%;
+	transform: translateY(-50%);
+}
+.clear-close {
+	position: relative;
+	display: flex;justify-content: center;align-items: center;
+	width: 40rpx;height: 40rpx;
+	border-radius: 100%; 
+	background-color: rgba(0,0,0,.3);
+}
+.clear-close span {
+	position: absolute;
+	width: 0;
+	border: 2rpx solid #FFFFFF;
+	height: 20rpx;
+	border-radius: 2rpx;
+}
+.clear-close span:first-child {transform: rotate(45deg);}
+.clear-close span:last-child {transform: rotate(-45deg);}
+	
\ No newline at end of file
diff --git a/components/containers/container-subgroup-two.vue b/components/containers/container-subgroup-two.vue
new file mode 100644
index 0000000..fcc3e1c
--- /dev/null
+++ b/components/containers/container-subgroup-two.vue
@@ -0,0 +1,64 @@
+<template>
+	<view>
+		<view class="pad-zy30" :style="{paddingTop:statusBarHeight + 'px',paddingBottom: '70px'}">
+			<slot name="content"></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"container-subgroup",
+		props:{
+			ifLoading:{
+				type:Boolean,
+				default:true
+			}
+		},
+		data() {
+			return {
+				statusBarHeight:uni.getSystemInfoSync().statusBarHeight + 50,
+				loading:true,
+				exist:''
+			};
+		},
+		// 执行顺序 第一
+		beforeCreate(){
+			
+		},
+		// 执行顺序 第二
+		created(){
+			
+		},
+		// 执行顺序 第三
+		beforeMount(){
+			
+		},
+		// 执行顺序 第四
+		mounted(){
+			setTimeout(()=>{
+				this.loading = false;
+			},500)
+		},
+		// 组件更新前
+		beforeUpdate(){
+			
+		},
+		// 组件更新后
+		updated(){
+			
+		},
+		// 组件销毁前：实例销毁之前调用。在这一步，实例仍然完全可用
+		beforeDestroy(){
+			
+		},
+		// 销毁所有实例
+		destroyed(){
+			
+		}
+	}
+</script>
+
+<style scoped>
+	
+</style>
diff --git a/components/status-nav.vue b/components/status-nav.vue
index 3a72df5..c79fcd2 100644
--- a/components/status-nav.vue
+++ b/components/status-nav.vue
@@ -10,8 +10,10 @@
             <!-- 返回键 -->
 			<view class="return-box" @tap="backEv" v-if="ifReturn" 
 				:style="{height: navBarHeight+'px'}">
-				<i class="icon icon-return" style="font-size: 40rpx;"
-					:style="{color: returnColor}"></i>
+				<slot name="leftContent">
+					<i class="icon icon-return" style="font-size: 40rpx;"
+						:style="{color: returnColor}"></i>
+				</slot>
 			</view>
             <!-- 标题 -->
 			<view class="tab-title" v-if="ifTitle && ifNet" 
@@ -65,7 +67,7 @@
 			// 导航栏标题
 			navBarTitle: {
 				type:String,
-				default:'佩丽商城'
+				default:''
 			},
 			// 标题最多几行显示
 			clipNumber: {
diff --git a/components/status-navs/status-nav-slot.vue b/components/status-navs/status-nav-slot.vue
new file mode 100644
index 0000000..7f7d2cc
--- /dev/null
+++ b/components/status-navs/status-nav-slot.vue
@@ -0,0 +1,190 @@
+<template>
+    <view class="status-box statusHNH">
+		<!-- 网络、电量栏 start -->
+        <view :style="{height: statusBarHeight+'px',background: backgroudColor}"></view>
+		<!-- 网络、电量栏 end -->
+		
+		<!-- 头部状态栏 start -->
+        <view class="status-nav" 
+			:style="{background: backgroudColor,height: navBarHeight+'px'}">
+            <!-- 返回键 -->
+			<view class="return-box" @tap="backEv" v-if="ifReturn" 
+				:style="{height: navBarHeight+'px'}">
+				<slot name="leftContent"></slot>
+			</view>
+            <!-- 标题 -->
+			<view class="tab-title" v-if="ifTitle && ifNet" 
+				:style="{
+					color: titleColor,
+					justifyContent: ifCenter ? 'center' : '',
+					padding: ifCenter ? '0px' : `${ifReturn ? '0 38' : '0 15'}px`}">
+				<view class="title-box" :class="['','clips1','clips2'][clipNumber]" :style="{maxWidth: ifCenter ? '360rpx' : '70%'}">
+					<slot name="centerContent">{{navBarTitle}}</slot>
+				</view>
+			</view>
+			<!-- 右边功能 -->
+			<view class="right-box">
+				<slot name="rightContent"></slot>
+			</view>
+        </view>
+		<!-- 头部状态栏 end -->
+    </view>
+</template>
+
+<script>
+    export default {
+		name:'status-nav',
+        props:{
+			//状态栏、导航栏背景颜色
+			backgroudColor:{
+			    type:String,
+			    default:'#FFFFFF'
+			},
+			// 默认导航栏高度
+			navBarHeight: {
+				type:Number,
+				default:50
+			},
+			//是否显示返回键
+            ifReturn:{
+                type:Boolean,
+                default:true
+            },
+			// 返回键颜色
+			returnColor: {
+				type:String,
+				default:'#000'
+			},
+			//是否显示标题
+			ifTitle:{
+			    type:Boolean,
+			    default:true
+			},
+			// 导航栏标题
+			navBarTitle: {
+				type:String,
+				default:''
+			},
+			// 标题最多几行显示
+			clipNumber: {
+				type:Number,
+				default:1
+			},
+			//标题颜色
+            titleColor:{
+                type:String,
+                default:'#333333'
+            },
+			// 标题是否居中
+			ifCenter: {
+				type:Boolean,
+				default: true
+			},
+			// 来自哪里
+			fromWhere: {
+				type:Number,
+				default:0
+			}
+        },
+		data(){
+			return {
+				statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
+				ifNet:true ,// 是否有网络
+				netText:'当前无网络',
+				netTimer:null
+			}
+		},
+		mounted() {
+			// 网络监测
+			this.$toolAll.tools.networkStatus();
+			// 缓存状态栏+标题栏的高度
+			// const query = wx.createSelectorQuery().in(this)
+			// query.select('.statusHNH').boundingClientRect((rect) => {
+			// 	uni.setStorageSync('statusHNH',rect.height)
+			// }).exec();
+			
+			// 获取当前页面路径
+			this.$toolAll.tools.obtainUrl();
+			this.$toolAll.tools.obtainUrlParam();
+			setTimeout(()=>{
+				this.ifNet = uni.getStorageSync('isNet');
+			},500)
+		},
+		methods:{
+			// 刷新网络事件
+			refreshEv(){
+				this.netText = '正在刷新...';
+				let outTime = 0;//十秒超时
+				this.netTimer = setInterval(()=>{
+					outTime++;
+					this.$toolAll.tools.networkStatus();
+					if(uni.getStorageSync('isNet')) {
+						clearInterval(this.netTimer);
+						this.ifNet = true;
+					} 
+					if(outTime==10) {
+						clearInterval(this.netTimer);
+						this.netText = '刷新失败';
+						outTime = 0;
+					}
+				},1000)
+			},
+			//返回事件
+			backEv(){
+				if(uni.getStorageSync('outside')*1==2){
+					this.fromWhere = uni.getStorageSync('outside')*1;
+				}
+				switch (this.fromWhere){
+					case 1:
+					case 2:
+					uni.navigateTo({
+						url:'/pages/tabbar/pagehome/pagehome'
+					})
+					uni.setStorageSync('outside',0)
+						break;
+					case 0:
+					uni.navigateBack({
+						delta:1
+					})
+						break;
+					default:
+						break;
+				}
+			}
+		}
+    }
+</script>
+
+<style scoped>
+	.clips1{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 1;overflow: hidden;text-overflow: ellipsis;word-wrap: break-word;word-break:break-all;}
+	.clips2{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;text-overflow: ellipsis;word-wrap: break-word;word-break:break-all;}
+	
+	.status-box{
+		position: fixed;top: 0;left: 0;right: 0;z-index: 10;
+	}
+	.status-nav{
+		width: 100%;
+		position: relative;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		height: 50px;
+		line-height: 50px;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+	}
+	.return-box {
+		display: flex;justify-content: center;align-items: center;flex-shrink: 0;
+		position: absolute;
+		padding: 0rpx 10rpx;
+	}
+	.return-box i {font-size: 56rpx;}
+	.tab-title{
+		width: 100%;
+		font-size: 38rpx;
+		display: flex;
+	}
+	.tab-title .title-box{margin-top: -4rpx;}
+	
+	.right-box {flex-shrink: 0;font-size: 30rpx;}
+</style>
diff --git a/pages.json b/pages.json
index 111a279..218c811 100644
--- a/pages.json
+++ b/pages.json
@@ -60,6 +60,20 @@
                 "navigationBarTitleText": "意见反馈",
                 "enablePullDownRefresh": false
             }
+        }
+        ,{
+            "path" : "pages/register/register",
+            "style" :{
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false,
+                "navigationStyle": "custom",//禁用原生导航栏，微信小程序可用
+                "navigationBarTextStyle":"black",
+                "app-plus": {
+                	"titleNView": false ,//禁用原生导航栏，APP和H5可用
+                	"bounce":"none",
+                	"scrollIndicator":"none"
+                } 
+            }
             
         }
     ], 
@@ -69,12 +83,10 @@
 			"pages": [
                 {
                     "path" : "test/test",
-                    "style" :                                                                                    
-                {
-                    "navigationBarTitleText": "",
-                    "enablePullDownRefresh": false
-                }
-                
+                    "style" : {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
                 }
             ]
 		}
diff --git a/pages/guide-page/guide-page.vue b/pages/guide-page/guide-page.vue
index 42b345c..b665b6b 100644
--- a/pages/guide-page/guide-page.vue
+++ b/pages/guide-page/guide-page.vue
@@ -12,16 +12,26 @@
 			}
 		},
 		onLoad() {
+			console.log(16);
 			this.checkContext();
+			// this.$requst.post('/universal/api.login/register',{
+			// 	phone:'18888888888',
+			// 	sms_code:'123456',
+			// 	password:'123456',
+			// 	confirm_password:'123456',
+			// 	affiliation:'中国中铁七局'
+			// }).then(res=>{
+			// 	console.log(res,25);
+			// })
 		},
 		methods: {
 			// 检测是否是微信端
 			checkContext(){
-				console.log(20);
-				// #ifdef APP-PLUS , H5 , APP
+				// #ifdef APP-PLUS
 					if(uni.getSystemInfoSync().platform != "devtools"){//devtools：开发版	值域为：ios、android、mac（3.1.10+）、windows（3.1.10+）、linux（3.1.10+）
 						console.log = () =>{}
 					}
+					console.log(35);
 					setTimeout(()=>{
 						uni.reLaunch({
 							url:'/pages/login/login'
@@ -29,9 +39,10 @@
 					},3000)
 				// #endif
 				// #ifdef H5
-					if(uni.getSystemInfoSync().platform != "devtools"){//devtools：开发版	值域为：ios、android、mac（3.1.10+）、windows（3.1.10+）、linux（3.1.10+）
+					if(uni.getSystemInfoSync().platform != "development"){//devtools：开发版	值域为：ios、android、mac（3.1.10+）、windows（3.1.10+）、linux（3.1.10+）
 						console.log = () =>{}
 					}
+					console.log(46);
 					setTimeout(()=>{
 						uni.reLaunch({
 							url:'/pages/login/login'
@@ -51,6 +62,7 @@
 						// 正式版-配置全局域名
 						// uni.setStorageSync('hostapi','https://hm.hmzfyy.cn/api/');
 					}
+					console.log(66);
 					setTimeout(()=>{
 						uni.reLaunch({
 							url:'/pages/tabbar/pagehome/pagehome'
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 17110bc..4a1c321 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -15,8 +15,8 @@
 		},
 		methods: {
 			gohome(){
-				uni.reLaunch({
-					url:'/pages/tabbar/pagehome/pagehome'
+				uni.navigateTo({
+					url:'/pages/register/register'
 				})
 			}
 		}
diff --git a/pages/register/register.vue b/pages/register/register.vue
new file mode 100644
index 0000000..898bf53
--- /dev/null
+++ b/pages/register/register.vue
@@ -0,0 +1,176 @@
+<template>
+	<view>
+		<status-nav-slot>
+			<view slot="leftContent" @tap="goLogin"><image class="register-close" src="/static/public/icon-close.png" mode="widthFix" lazy-load></image></view>
+			<view slot="rightContent" @tap="goLogin">登录</view>
+		</status-nav-slot>
+		<container-subgroup-two>
+			<view slot="content">
+				<view class="disjcac">
+					<image src="/static/public/icon-register.png" mode="widthFix" lazy-load></image>
+				</view>
+				<view class="register-title line-h56">
+					<view class="fon40 bold">注册</view>
+					<view class="fon28">欢迎来到飞猴云服务平台</view>
+				</view>
+				<view class="fon24">
+					<!-- 手机号 -->
+					<view class="disac mar-s30">
+						<view class="disac fon30">+86 <view class="register-phone-img"></view></view>
+						<view class="posir width100">
+							<input class="clear-input" type="number" maxlength="11" v-model="register_phone" placeholder="请输入手机号" placeholder-class="placeholderColor" />
+							<!-- 清除按钮 -->
+							<view class="clear-box" v-show="register_phone!=''" @tap="clearInput(0)"><view class="clear-close"><span></span><span></span></view></view>
+						</view>
+					</view>
+					<!-- 验证码 -->
+					<view class="disjbac mar-s50">
+						<view class="posir width100">
+							<input class="clear-input" type="number" maxlength="4" v-model="register_code" placeholder="请输入验证码" placeholder-class="placeholderColor" />
+							<!-- 清除按钮 -->
+							<view class="clear-box" v-show="register_code!=''" @tap="clearInput(1)"><view class="clear-close"><span></span><span></span></view></view>
+						</view>
+						<view class="obtain-code">获取验证码</view>
+					</view>
+					<!-- 密码 -->
+					<view class="disjbac mar-s50">
+						<view class="posir width100">
+							<input class="clear-input" type="text" maxlength="16" v-model="register_password" placeholder="请输入密码" placeholder-class="placeholderColor" />
+							<!-- 清除按钮 -->
+							<view class="clear-box" v-show="register_password!=''" @tap="clearInput(2)"><view class="clear-close"><span></span><span></span></view></view>
+						</view>
+					</view>
+					<!-- 确认密码 -->
+					<view class="disjbac mar-s50">
+						<view class="posir width100">
+							<input class="clear-input" type="text" maxlength="16" v-model="register_qpassword" placeholder="请再次确认密码" placeholder-class="placeholderColor" />
+							<!-- 清除按钮 -->
+							<view class="clear-box" v-show="register_qpassword!=''" @tap="clearInput(3)"><view class="clear-close"><span></span><span></span></view></view>
+						</view>
+					</view>
+					<!-- 单位名称 -->
+					<view class="disjbac mar-s50">
+						<view class="posir width100">
+							<input class="clear-input" type="text" v-model="register_unitName" placeholder="请输入单位名称" placeholder-class="placeholderColor" />
+							<!-- 清除按钮 -->
+							<view class="clear-box" v-show="register_unitName!=''" @tap="clearInput(4)"><view class="clear-close"><span></span><span></span></view></view>
+						</view>
+					</view>
+					<!-- 协议、政策 -->
+					<view class="disac mar-s50">
+						<label class="radio disac col9" @tap="chooseXY">
+							<radio class="register-radio" color="#03affb" :checked="ifAgreen"/><view>我已阅读并同意 <text @tap.stop="goXY(0)" class="register-agree-policy">《飞猴用户服务协议》</text>和 <text @tap.stop="goXY(1)" class="register-agree-policy">《飞猴隐私政策》</text></view>
+						</label>
+					</view>
+					<!-- 免费注册 -->
+					<view class="register-btn" @tap="submitEv">免费注册</view>
+				</view>
+			</view>
+		</container-subgroup-two>
+	</view>
+</template>
+
+<script>
+	import statusNavSlot from '@/components/status-navs/status-nav-slot.vue';
+	import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue';
+	export default {
+		components:{
+			statusNavSlot,
+			containerSubgroupTwo
+		},
+		data() {
+			return {
+				register_phone:'', // 注册时的手机号
+				register_code:'', // 注册时的验证码
+				register_password:'', // 注册时的密码
+				register_qpassword:'', // 注册时的确认密码
+				register_unitName:'', // 注册时的单位名称
+				ifAgreen:false // 注册时是否勾选协议与政策
+			}
+		},
+		methods: {
+			// 提交事件
+			submitEv(){
+				if(this.checkEmpty()){
+					console.log('执行事件');
+				}
+			},
+			// 检测是否某个输入框为空
+			checkEmpty(){
+				let ifEmpty = true;
+				if(this.$toolAll.tools.isPhone(this.register_phone)) {
+					this.$toolAll.tools.showToast('手机号格式不正确');
+					ifEmpty = false;
+					return;
+				}
+				if(!this.register_code) {
+					this.$toolAll.tools.showToast('请输入验证码');
+					ifEmpty = false;
+					return;
+				}
+				if(!this.register_password) {
+					this.$toolAll.tools.showToast('密码不能为空');
+					ifEmpty = false;
+					return;
+				}
+				if(!this.register_qpassword) {
+					this.$toolAll.tools.showToast('确认密码不能为空');
+					ifEmpty = false;
+					return;
+				}
+				if(this.register_password != this.register_qpassword) {
+					this.$toolAll.tools.showToast('两次输入的密码必须相同');
+					ifEmpty = false;
+					return;
+				}
+				if(!this.register_unitName) {
+					this.$toolAll.tools.showToast('请输入单位名称');
+					ifEmpty = false;
+					return;
+				}
+				if(!this.ifAgreen) {
+					this.$toolAll.tools.showToast('请勾选协议与政策');
+					ifEmpty = false;
+					return;
+				}
+				return ifEmpty;
+			},
+			// 关闭当前页返回到登录页
+			goLogin(){
+				uni.navigateBack({delta:1})
+			},
+			// 清除手机号
+			clearInput(index){
+				switch (index){
+					case 0:
+					this.register_phone = '';
+						break;
+					case 1:
+					this.register_code = '';
+						break;
+					case 2:
+					this.register_password = '';
+						break;
+					case 3:
+					this.register_qpassword = '';
+						break;
+					case 4:
+					this.register_unitName = '';
+						break;
+				}
+			},
+			// 勾选协议
+			chooseXY(){
+				this.ifAgreen = !this.ifAgreen;
+			},
+			// 前往协议或政策
+			goXY(index){
+				console.log(index);
+			}
+		}
+	}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/static/public/icon-close.png b/static/public/icon-close.png
new file mode 100644
index 0000000..2317355
Binary files /dev/null and b/static/public/icon-close.png differ
diff --git a/static/public/icon-register.png b/static/public/icon-register.png
new file mode 100644
index 0000000..4b6af8f
Binary files /dev/null and b/static/public/icon-register.png differ