diff --git a/aircraft/server/my/child_pages/login.vue b/aircraft/server/my/child_pages/login.vue
index 5f64aac..26862a3 100644
--- a/aircraft/server/my/child_pages/login.vue
+++ b/aircraft/server/my/child_pages/login.vue
@@ -26,7 +26,7 @@
 			:custom-style="{borderRadius: '8rpx',background: '#2563EB',
 			color:'#FFFFFF',fontWeight: '500',fontSize:'32rpx',fontFamily:'Roboto',
 			padding:'40rpx 0',marginTop:'42rpx',opacity: isDisable ? 0.6 : 1}"
-			>登 录</u-button>
+			@click="submit">登 录</u-button>
 			<view class="login-form-change" @click="currentLoginType=(currentLoginType+1)%2">
 				切换至{{ currentLoginType ? '用户' : '飞行员' }}登录
 			</view>
@@ -42,6 +42,7 @@
 <script>
 import lwTopnav from '@/components/lw-topnav/lw-topnav.vue';
 import configService from '@/common/config.service.js';
+import { encrypt } from '@/utils/rsaEncrypt'
 export default {
 	// #ifdef MP
 	options: {
@@ -126,7 +127,7 @@ export default {
 	},
 	methods:{
 		// 提交
-		submit(){
+		async submit(){
 			if(!this.isAgreed){
 				this.$refs.uToast.show({type: 'warning',title: "请阅读并勾选同意协议!"});
 				return;
@@ -134,51 +135,37 @@ export default {
 			try{
 				let that = this;
 				this.dotLoading = true;
-				// this.$refs.loginForm.validate(async(valid) => {
-				// 	if (valid) {
-				// 		// 判断注册或登录的表单值，进行调整匹配
-				// 		if(!that.current) delete that.loginForm.confirmPassword;
-				// 		let res = await that.$api[that.current?'register':'login'](that.loginForm);
-				// 		if(res.success){
-				// 			if(!that.current){
-				// 				// 存储登录记录
-				// 				uni.setStorageSync('loginMemory',JSON.stringify({
-				// 					username: that.loginForm.username,
-				// 					password: that.loginForm.password,
-				// 					timer: new Date()
-				// 				}));
-				// 				that.$u.vuex('vuex_token', res.data.token);
-				// 				// that.$u.vuex('vuex_token', 'fbc545a91cc94fe89296828a25a7e08e@9085553879028596738');
-				// 				await that.$u.vuex('user_message', JSON.stringify(res.data.user));
-				// 				if(that.nextUrl===''){
-				// 					uni.navigateBack({complete() {
-				// 						setTimeout(()=>{
-				// 							uni.showToast({icon: 'none', title: '登录成功！'});
-				// 						},600)
-				// 					}})
-				// 				}else{
-				// 					uni.redirectTo({
-				// 						url: that.nextUrl,
-				// 						complete() {
-				// 							setTimeout(()=>{
-				// 								uni.showToast({icon: 'none', title: '登录成功！'});
-				// 							},600)
-				// 						}
-				// 					});
-				// 				}
-				// 			}else{
-				// 				that.$refs.uToast.show({type: 'success',title: "注册成功，请登录"});
-				// 				that.current = 0;
-				// 			}
-				// 			that.$refs.loginForm.resetFields();
-				// 		}else{
-				// 			that.$refs.uToast.show({type: 'error',
-				// 			title: that.current?`${res.data}!`:"手机号或密码错误!"});
-				// 		}
-				// 	}
-				// });
-			}catch(e){}
-			finally{
+				const isA = that.currentLoginType===1;
+				let res = await that.$api[isA?'aLogin':'bLogin']
+				({...that.loginForm,password:encrypt(that.loginForm.password)});
+				if(!res){
+					that.$refs.uToast.show({type: 'error',title: "账号或密码错误!"});
+				}else{
+					// 存储登录记录
+					uni.setStorageSync('loginMemory',JSON.stringify({...that.loginForm,timer: new Date()}));
+					that.$u.vuex('vuex_token', res.token);
+					// that.$u.vuex('vuex_token', 'fbc545a91cc94fe89296828a25a7e08e@9085553879028596738');
+					await that.$u.vuex('user_message', JSON.stringify(res.user.user));
+					if(that.nextUrl===''){
+						uni.navigateBack({complete() {
+							setTimeout(()=>{
+								uni.showToast({icon: 'none', title: '登录成功！'});
+							},600)
+						}})
+					}else{
+						uni.redirectTo({
+							url: that.nextUrl,
+							complete() {
+								setTimeout(()=>{
+									uni.showToast({icon: 'none', title: '登录成功！'});
+								},600)
+							}
+						});
+					}
+				}
+			}catch(e){
+				that.$refs.uToast.show({type: 'error',title: "处理失败!"});
+			}finally{
 				this.dotLoading = false;
 			}
 		},
diff --git a/common/config.service.js b/common/config.service.js
index a17e51f..04756d0 100644
--- a/common/config.service.js
+++ b/common/config.service.js
@@ -1,11 +1,11 @@
 // 接口环境
 
 // #ifdef H5
-let BASE_URL = '/aerocraftApi';
+let BASE_URL = '/aerocraftAdminApi';
 // #endif
 // #ifdef APP-PLUS ||MP
-let BASE_URL = 'http://8.138.171.103/aerocraftApi';// 测试环境
-// let BASE_URL = 'https://www.ylemai.cn/aerocraftApi';// 正式环境
+let BASE_URL = 'http://8.138.171.103/aerocraftAdminApi';// 测试环境
+// let BASE_URL = 'https://www.ylemai.cn/aerocraftAdminApi';// 正式环境
 // #endif
 
 let IP = 'http://8.138.171.103/';// 测试环境
diff --git a/common/http.api.js b/common/http.api.js
index b8a0211..b5f1a5d 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -3,32 +3,15 @@ import configService from '@/common/config.service.js';
 const install = (Vue, vm) => {
 	
 	// 用户管理
-	vm.$api.wxLogin = async (params = {}) => await vm.$u.get('/acUser/wxPhoneLogin', params);// 手机号一键登录
-	vm.$api.login = async (params = {}) => await vm.$u.get('/acUser/phoneLogin', params);// 手机号登录
-	vm.$api.logOut = async () => await vm.$u.get('/acUser/logout');// 用户登出
-	vm.$api.register = async (params = {}) => await vm.$u.get('/acUser/phoneRegister', params);// 手机号注册
-	vm.$api.getCurrency = async () => await vm.$u.get('/paVipCurrency');// 用户余额查询
-	vm.$api.getConsumption = async (params = {}) => await vm.$u.get('/paConsumption',params);// 用户消费记录查询
+	vm.$api.aLogin = async (params = {}) => await vm.$u.post('/auth/login/a', params);// 飞行员端登录
+	vm.$api.bLogin = async (params = {}) => await vm.$u.post('/auth/login/b', params);// 用户端登录
+	vm.$api.logOut = async () => await vm.$u.get('/auth/logout');// 用户登出
 	
 	// 轮播图管理
 	vm.$api.allBanners = async () => await vm.$u.get('/cpBanner/all');// 获取全部轮播图
 	
-	// 图片管理
-	vm.$api.getCpPhotoById = async (params = {}) => await vm.$u.get('/cpPhoto/all', params);// 根据标签id查询全部图片
-	vm.$api.singlePhotoById = async (id) => await vm.$u.get(`/cpPhoto/${id}`);// 根据图片id查询单个图片
-	
 	// 文章管理（查询协议）
 	vm.$api.getArticles = async (params = {}) => await vm.$u.get('/cpArticle', params);// 分页查询文章
-	
-	// 留言板
-	vm.$api.addMessage = async (params = {}) => await vm.$u.post('/cpMessage', params);// 添加留言
-	
-	// 附件管理
-	vm.$api.getOssSignal = async () => await vm.$u.get('/enAttachment/getOssSignal');// 获取OSS Url临时签名
-	
-	// 标签管理
-	vm.$api.getLabels = async (moduleid) => await vm.$u.get(`/cpLabel/moduleid/${moduleid}`);// 查询模块下的标签
-	vm.$api.singleLabel = async (id) => await vm.$u.get(`/cpLabel/${id}`);// 查询单个标签
 }
 
 export default {
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index bad63b1..c11ade1 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -34,7 +34,7 @@ const install = (Vue, vm) => {
 		// 	return false;
 		// }
 		
-		config.header.token = vm.$store.state.vuex_token;
+		config.header.Authorization = vm.$store.state.vuex_token;
 		// if (config.method == 'POST') {
 		// 	config.data['__token__'] = vm.vuex__token__;
 		// }
@@ -84,7 +84,7 @@ const install = (Vue, vm) => {
 					return res.data;
 				} else {
 					console.error(res)
-					vm.$u.toast('网络请求错误！');
+					// vm.$u.toast('网络请求错误！');
 				}
 		}
 
diff --git a/components/loading/dot-loading.vue b/components/loading/dot-loading.vue
index f1c79b7..ccbd607 100644
--- a/components/loading/dot-loading.vue
+++ b/components/loading/dot-loading.vue
@@ -62,7 +62,7 @@
 	        top: 0;
 	        left: 0;
 	        border-radius: 50%;
-	        background: linear-gradient(180deg, #96fe11 0%, #f0fdbf 100%);
+	        background: linear-gradient(180deg, #a8f0ee 0%, #f0fdbf 100%);
 	        transform:scale(0);
 	        animation:animloader 1.5s infinite ease-in-out;
 	    }
diff --git a/utils/rsaEncrypt.js b/utils/rsaEncrypt.js
new file mode 100644
index 0000000..1948ddd
--- /dev/null
+++ b/utils/rsaEncrypt.js
@@ -0,0 +1,14 @@
+import JSEncrypt from 'jsencrypt/bin/jsencrypt.min'
+
+// 密钥对生成 http://web.chacuo.net/netrsakeypair
+
+const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANL378k3RiZHWx5AfJqdH9xRNBmD9wGD\n' +
+  '2iRe41HdTNF8RUhNnHit5NpMNtGL0NPTSSpPjjI1kJfVorRvaQerUgkCAwEAAQ=='
+
+// 加密
+export function encrypt(txt) {
+  const encryptor = new JSEncrypt()
+  encryptor.setPublicKey(publicKey) // 设置公钥
+  return encryptor.encrypt(txt) // 对需要加密的数据进行加密
+}
+