1.登录 逻辑

operatingCompany/common/request.js

@@ -12,11 +12,11 @@ const http = (url = '', date = {}, type = 'POST', header = {
     return new Promise((resolve, reject) => {
 		//console.log(burl2 + url)
 		header={};
-		const logodata = uni.getStorageSync("logodata");
-		// header['token']=logodata.token;
-		// header['uid']=logodata.uid; 
-		header['token']='BA205B2ABFE4445EA5D111042E7BCE56';
-		header['uid']='BE98A41B9E0C44C1B5EDCBCE39D550D0'; 
+		const logInData = uni.getStorageSync("logInData");
+		header['token']=logInData.token;
+		header['uid']=logInData.uid; 
+		// header['token']='BA205B2ABFE4445EA5D111042E7BCE56';
+		// header['uid']='BE98A41B9E0C44C1B5EDCBCE39D550D0'; 
 		header['Content-Type']='application/x-www-form-urlencoded';
 		//console.log(header)
         uni.request({
@@ -26,25 +26,34 @@ const http = (url = '', date = {}, type = 'POST', header = {
             header: header,
             dataType: 'json',         
         }).then((response) => {
-           /* setTimeout(function() {
+            setTimeout(function() {
                 uni.hideLoading();
-            }, 200); */
+            }, 200); 
             let [error, res] = response;
-		 
-			if(res.data.code==401){
+			
+			if(res.data.code==1){
+				 uni.showToast({
+				     title: res.data.msg ? res.data.msg : '接口错误',
+				 	 icon:'none',
+				     duration: 2000,
+				 });
+				
+			}
+			else if(res.data.code==401){
 				 uni.showToast({
 				     title: res.data.msg,
 				 	 icon:'none',
 				     duration: 3000,
 				 });
-				/* uni.clearStorageSync()
+				uni.clearStorageSync()
 				 uni.navigateTo({
 					url:'../login/login'
-				 }) */
-			}else if(res.data.code==409){
-				 // getToken(url,date,type,header)
+				 })
+			}else if(res.data.code==0){
+				// 正常
+				 resolve(res.data);
 			}
-            resolve(res.data);
+            
         }).catch(error => {
             let [err, res] = error;
             reject(err)

operatingCompany/pages.json

@@ -1,87 +1,80 @@
-{
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "首页",
-				 "navigationBarBackgroundColor":"#FFFFFF"
-			}
-		},
-		{
-			"path": "pages/team/myTeam",
-			"style": {
-				"navigationBarTitleText": "我的团队",
-				 "navigationBarBackgroundColor":"#FFFFFF",
-				  "enablePullDownRefresh": true
-			}
-		},
-	    {
-	        "path" : "pages/team/manageStore",
-	        "style" :                                                                                    
-	        {
-	            "navigationBarTitleText": "管理门店",
-	    		"navigationBarBackgroundColor":"#FFFFFF",
-	            "enablePullDownRefresh": true
-	        }
-	        
-	    },
-        {
-            "path" : "pages/teamStore/teamStore",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "团队门店",
-				"navigationBarBackgroundColor":"#FFFFFF",
-                "enablePullDownRefresh": true
-            }
-            
-        }
-        
-        ,{
-            "path" : "pages/accountSet/accountSet",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "账户设置",
-				"navigationBarBackgroundColor":"#FFFFFF",
-                "enablePullDownRefresh": false
-            }
-            
-        },
-		{
-		    "path" : "pages/changePassWord/changePassWord",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "修改密码",
-				"navigationBarBackgroundColor":"#FFFFFF",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-		    "path" : "pages/logIn/logIn",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "登录",
-		        "enablePullDownRefresh": false
-		    }
-		    
+{
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/logIn/logIn",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "首页",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		},
+		{
+			"path": "pages/team/myTeam",
+			"style": {
+				"navigationBarTitleText": "我的团队",
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/team/manageStore",
+			"style": {
+				"navigationBarTitleText": "管理门店",
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"enablePullDownRefresh": true
+			}
+
+		},
+		{
+			"path": "pages/teamStore/teamStore",
+			"style": {
+				"navigationBarTitleText": "团队门店",
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"enablePullDownRefresh": true
+			}
+
 		}
-        
-        ,{
-            "path" : "pages/upcoming/upcoming",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "待办事项",
-				"navigationBarBackgroundColor":"#FFFFFF",
-                "enablePullDownRefresh": true
-            }
-            
-        }
-    ],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
-	}
+
+		, {
+			"path": "pages/accountSet/accountSet",
+			"style": {
+				"navigationBarTitleText": "账户设置",
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/changePassWord/changePassWord",
+			"style": {
+				"navigationBarTitleText": "修改密码",
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"enablePullDownRefresh": false
+			}
+
+		},
+
+		{
+			"path": "pages/upcoming/upcoming",
+			"style": {
+				"navigationBarTitleText": "待办事项",
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"enablePullDownRefresh": true
+			}
+
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8"
+	}
 }

operatingCompany/pages/AccountSet/AccountSet.vue

@@ -5,19 +5,19 @@
 			<!-- 头像 -->
 			<view class="message line">
 				<view class="leftTitle">头像</view>
-				<image class="headImg" src='headUrl' mode=""></image>
+				<image class="headImg" src='../../static/img/pic_def_ava@2x.png' mode=""></image>
 			</view>
 
 			<!-- 姓名 -->
 			<view class="message line">
 				<view class="leftTitle">姓名</view>
-				<view class="rightContent">张老师</view>
+				<view class="rightContent">{{userInfo.name}}</view>
 			</view>
 
 			<!-- 所属部门 -->
 			<view class="message">
 				<view class="leftTitle">所属部门</view>
-				<view class="rightContent">总部一店</view>
+				<view class="rightContent" v-if="userInfo.deptNmae != null">{{userInfo.deptNmae}}</view>
 			</view>
 		</view>
 
@@ -39,18 +39,24 @@
 	export default {
 		data() {
 			return {
-				headUrl: '',
+				userInfo: '',
 			}
 		},
+		onLoad() {
+			this.userInfo = uni.getStorageSync("userInfo");
+			
+		},
 		methods: {
 			goRouter(url) {
-				console.log('修改密码');
 				uni.navigateTo({
 					url: url
 				})
 			},
-			logOut() {
-				console.log('退出');
+			logOut() {
+				uni.clearStorageSync();
+				uni.navigateTo({
+					url: '../logIn/logIn'
+				})
 			},
 		}
 	}
@@ -94,7 +100,6 @@
 		width: 72rpx;
 		height: 72rpx;
 		margin-right: 20rpx;
-		background-color: #007AFF;
 
 	}
 

operatingCompany/pages/logIn/logIn.vue

@@ -1,29 +1,40 @@
 <template>
 	<view class="content">
 
-		<view class="messageBg">
-			<!-- 新密码 -->
-			<view class="message line">
-				<view class="leftTitle">手机号：</view>
-				<input type="text" class="passWord" placeholder="请输入" v-model="newPW" @confirm="newPWDone" />
-			</view>
+		<image class="topImg" src="../../static/img/dl_bg@2x.png" mode=""></image>
 
-			<!-- 确认密码 -->
-			<view class="message">
-				<view class="leftTitle">验证码：</view>
-				<input type="text" class="passWord" placeholder="请输入" v-model="surePW" @confirm="surePWDone" />
-			</view>
+		<view style="color: #3C3C3C; font-size: 40rpx; font-weight: bold; padding-left: 48rpx;">选择角色</view>
 
+		<!-- 选择角色 -->
+		<view class="roleSelect">
+			<view class="role_S" v-if="roleType == 1" @click="roleTypeFirst">运营陪伴</view>
+			<view class="role_N" v-else @click="roleTypeFirst">运营陪伴</view>
 
+			<view class="role_S" v-if="roleType == 2" @click="roleTypeSecond">连锁门店</view>
+			<view class="role_N" v-else @click="roleTypeSecond">连锁门店</view>
 		</view>
 
 
+		<view style="color: #3C3C3C; font-size: 40rpx; font-weight: bold; padding-left: 48rpx;">登录</view>
+
+
+		<!-- 手机号 -->
+		<input type="text" class="phone" placeholder="请输入手机号" v-model="phoneValue" @confirm="phoneDone" />
+
+		<!-- 验证码 -->
+		<view class="codeBg">
+			<input type="text" class="code" placeholder="请输入验证码" v-model="codeValue" @confirm="codeDone" />
+			<view @click="send" v-if="phoneValue.length == 11" style="color: #FF4F00; font-size: 28rpx;">获取验证码</view>
+			<view style="color: #999999; font-size: 28rpx;" v-else>获取验证码</view>
+		</view>
+
+
+		<!-- 登录 -->
+		<view class="logInBtn_S" @click="logIn" v-if="phoneValue.length == 11 && codeValue != ''">登录</view>
+		<view class="logInBtn_N" v-else>登录</view>
+		<!-- 取消登录 -->
+		<view class="logOutBtn">取消登录</view>
 
-		<!-- 修改 -->
-		<view class="sureBtn" @click="changePW">登录</view>
-		
-		<!-- 发送验证码 -->
-		<view class="sureBtn" @click="send">发送验证码</view>
 	</view>
 </template>
 
@@ -31,80 +42,68 @@
 	export default {
 		data() {
 			return {
-				newPW: '',
-				surePW: '',
+				roleType: 1, //1 运营陪伴 2 连锁门店
+				phoneValue: '',
+				codeValue: '',
+				
 
 			}
 		},
 		methods: {
-			newPWDone(e) {
-				this.newPW = e.target.value;
-				console.log(this.newPW);
+			roleTypeFirst() {
+				this.roleType = 1
+				console.log('运营陪伴');
 			},
-			surePWDone(e) {
-				this.surePW = e.target.value;
-				console.log(this.surePW);
-			},
-			send(){
-				this.$http('accompany/superusers/sendSms',{
-					phone:this.newPW,
-					
-				},'GET').then(res => {
-					console.log(res);
-					
-					var userInfo=res.data.userInfo
-					uni.setStorage({
-					   key: 'userInfo',
-					   data:res.data.userInfo,
-					   success: function () {
-					   }
-					})
-					var erpId=res.data.erpId
-					var token=res.data.token
-					uni.setStorage({
-					   key: 'erpId',
-					   data:erpId,
-					   success: function () {
-					   }
-					})
-					uni.setStorage({
-						key: 'token',
-						data:token,
-						success: function () {
-						}
-					})
-				})
+			roleTypeSecond() {
+				this.roleType = 2
+				console.log('连锁门店');
 			},
-			changePW() {
-				
-				uni.showLoading({
-					title:'加载中'
-				})
-				this.$http('accompany/superusers/phoneLogin',{
-					phone:this.newPW,
-					code:this.surePW,
-					type:1,
-				},'POST').then(res => {
-					console.log(res)
-					uni.hideLoading()
-					
-					uni.setStorage({
-					   key: 'token',
-					   data:res.data.token,
-					   success: function () {
-					   }
-					})
-					
+			phoneDone(e) {
+				this.phoneValue = e.target.value;
+			},
+			codeDone(e) {
+				this.codeValue = e.target.value;
+			},
+			// 发送验证码
+			send() {
+				console.log('发送验证码');
+				this.$http('accompany/superusers/sendSms', {
+					phone: this.phoneValue,
+
+				}, 'GET').then(res => {
+
+				})
+			},
+			logIn() {
+
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.$http('accompany/superusers/phoneLogin', {
+					phone: this.phoneValue,
+					code: this.codeValue,
+					type: this.roleType,
+				}, 'POST').then(res => {
+					console.log(res)
+
 					uni.setStorage({
-					   key: 'uid',
-					   data:res.data.uid,
-					   success: function () {
-					   }
-					})
+						key: 'logInData',
+						data: res.data,
+						success: function() {
 					
-					uni.navigateTo({
-					   url: '../index/index'
-					})
+						}
+					})
+					uni.setStorage({
+						key: 'userInfo',
+						data: res.data.userInfo,
+						success: function() {
+
+						}
+					})
+
+					uni.navigateTo({
+						url: '../index/index'
+					})
 				})
 			}
 		}
@@ -113,61 +112,102 @@
 
 <style>
 	.content {
-		background-color: #F4F5F7;
+		background-color: #FFFFFF;
 		min-height: 100vh;
-		padding: 20rpx 24rpx;
+
 	}
 
 	/* #ifdef H5 */
 	.content {
-		background-color: #F4F5F7;
+		background-color: #FFFFFF;
 		min-height: calc(100vh - 44px);
-		padding: 20rpx 24rpx;
 	}
 
 	/* #endif */
 
-	.messageBg,
-	.sureBtn {
-		background-color: #FFFFFF;
-		border-radius: 10rpx;
-		margin: 20rpx 0rpx;
 
+	.topImg {
+		padding-left: 152rpx;
+		height: 256rpx;
 	}
 
-	.message {
+	.roleSelect {
+		padding: 24rpx 48rpx;
 		display: flex;
-		justify-content: flex-start;
-		line-height: 98rpx;
-		align-items: center;
+		justify-content: space-between;
+		text-align: center;
 	}
 
-	.line {
-		border-bottom: 1rpx solid #EEEEEE;
+	.role_S {
+		color: #FF4F00;
+		font-size: 28rpx;
+		border: 2rpx #FF4F00 solid;
+		border-radius: 50rpx;
+		height: 88rpx;
+		width: 41%;
+		line-height: 88rpx;
 	}
 
-
-
-	.leftTitle {
-		font-size: 28rpx;
+	.role_N {
 		color: #3C3C3C;
-		margin-left: 20rpx;
-		width: 140rpx;
+		font-size: 28rpx;
+		background-color: #F4F5F7;
+		border-radius: 50rpx;
+		height: 88rpx;
+		width: 41%;
+		line-height: 88rpx;
 	}
 
-	.passWord {
-		flex-grow: 1;
+	.phone,
+	.codeBg {
+		margin: 0rpx 48rpx;
+		padding-top: 48rpx;
+		padding-bottom: 22rpx;
+		color: #3C3C3C;
 		font-size: 28rpx;
-		color: #999999;
-		margin-left: 52rpx;
-		margin-right: 20rpx;
+		border-bottom: 2rpx #F4F5F7 solid;
+	}
+
+	.codeBg {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.logInBtn_S {
+		margin: 50rpx 48rpx;
+		width: 100vw-96rpx;
+		height: 88rpx;
+		border-radius: 50rpx;
+		background-color: #FF8700;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		font-weight: bold;
+		line-height: 88rpx;
+		text-align: center;
 	}
 
+	.logInBtn_N {
+		margin: 50rpx 48rpx;
+		width: 100vw-96rpx;
+		height: 88rpx;
+		border-radius: 50rpx;
+		background-color: #F4F5F7;
+		color: #999999;
+		font-size: 30rpx;
+		font-weight: bold;
+		line-height: 88rpx;
+		text-align: center;
+	}
 
-	.sureBtn {
-		line-height: 98rpx;
+	.logOutBtn {
+		position: fixed;
+		bottom: 130rpx;
+		left: 275rpx;
+		width: 200rpx;
+		height: 42rpx;
 		text-align: center;
-		color: #FFFFFF;
-		background-color: #FF8700;
+		line-height: 42rpx;
+		font-size: 30rpx;
+		color: #999999;
 	}
 </style>

operatingCompany/pages/team/manageStore.vue

@@ -17,10 +17,10 @@
 						<view class="shopName">{{item.ShopName}}</view>
 
 						<!-- 地址和电话 -->
-						<image class="tubiao" src="../../static/img/icon_daohang_def.png" mode=""
+						<image class="tubiao" src="../../static/img/icon_daohang_def@2x.png" mode=""
 							@click="goAddress(item.lng, item.lat)">
 						</image>
-						<image class="tubiao" src="../../static/img/icon_phone_def.png" mode=""
+						<image class="tubiao" src="../../static/img/icon_phone_def@2x.png" mode=""
 							@click="call(item.ContactorPhone)">
 						</image>
 					</view>
@@ -84,7 +84,6 @@
 						lat: this.lat,
 					}
 				this.$http(url, params, 'GET').then(res => {
-					uni.hideLoading()
 					this.shopData = res.data
 
 				})

operatingCompany/pages/team/myTeam.vue

@@ -73,7 +73,6 @@
 						name: this.searchValue
 					}
 				this.$http(url, params, 'GET').then(res => {
-					uni.hideLoading()
 					this.count = Number(res.data.count)
 					this.data = res.data.list
 				})

operatingCompany/pages/teamStore/teamStore.vue

@@ -37,10 +37,10 @@
 						<view class="shopName">{{item.ShopName}}</view>
 
 						<!-- 地址 和电话 图标 -->
-						<image class="tubiao" src="../../static/img/icon_daohang_def.png"
+						<image class="tubiao" src="../../static/img/icon_daohang_def@2x.png"
 							@click="goAddress(item.lng, item.lat)">
 						</image>
-						<image class="tubiao" src="../../static/img/icon_phone_def.png"
+						<image class="tubiao" src="../../static/img/icon_phone_def@2x.png"
 							@click="call(item.ContactorPhone)">
 						</image>
 
@@ -165,7 +165,6 @@
 						name: '',
 					}
 				this.$http(url, params, 'GET').then(res => {
-					uni.hideLoading()
 					this.thirdArr = res.data
 				})
 			},
@@ -186,7 +185,6 @@
 						lat: this.lat,
 					}
 				this.$http(url, params, 'GET').then(res => {
-					uni.hideLoading()
 					var list = res.data
 					if (list.length < 10) {
 						this.noMoreShow = true

operatingCompany/unpackage/dist/dev/mp-weixin/app.json

@@ -1,12 +1,12 @@
 {
   "pages": [
+    "pages/logIn/logIn",
     "pages/index/index",
     "pages/team/myTeam",
     "pages/team/manageStore",
     "pages/teamStore/teamStore",
     "pages/accountSet/accountSet",
     "pages/changePassWord/changePassWord",
-    "pages/logIn/logIn",
     "pages/upcoming/upcoming"
   ],
   "subPackages": [],
@@ -16,6 +16,10 @@
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#F8F8F8"
   },
-  "usingComponents": {},
-  "sitemapLocation": "sitemap.json"
+  "permission": {
+    "scope.userLocation": {
+      "desc": "获取门店地址"
+    }
+  },
+  "usingComponents": {}
 }

operatingCompany/unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -8176,11 +8176,11 @@ var http = function http()
   return new Promise(function (resolve, reject) {
     //console.log(burl2 + url)
     header = {};
-    var logodata = uni.getStorageSync("logodata");
-    // header['token']=logodata.token;
-    // header['uid']=logodata.uid; 
-    header['token'] = 'BA205B2ABFE4445EA5D111042E7BCE56';
-    header['uid'] = 'BE98A41B9E0C44C1B5EDCBCE39D550D0';
+    var logInData = uni.getStorageSync("logInData");
+    header['token'] = logInData.token;
+    header['uid'] = logInData.uid;
+    // header['token']='BA205B2ABFE4445EA5D111042E7BCE56';
+    // header['uid']='BE98A41B9E0C44C1B5EDCBCE39D550D0'; 
     header['Content-Type'] = 'application/x-www-form-urlencoded';
     //console.log(header)
     uni.request({
@@ -8190,25 +8190,34 @@ var http = function http()
       header: header,
       dataType: 'json' }).
     then(function (response) {
-      /* setTimeout(function() {
-                                   uni.hideLoading();
-                               }, 200); */var _response = _slicedToArray(
+      setTimeout(function () {
+        uni.hideLoading();
+      }, 200);var _response = _slicedToArray(
       response, 2),error = _response[0],res = _response[1];
 
+      if (res.data.code == 1) {
+        uni.showToast({
+          title: res.data.msg ? res.data.msg : '接口错误',
+          icon: 'none',
+          duration: 2000 });
+
+
+      } else
       if (res.data.code == 401) {
         uni.showToast({
           title: res.data.msg,
           icon: 'none',
           duration: 3000 });
 
-        /* uni.clearStorageSync()
-                              uni.navigateTo({
-                             	url:'../login/login'
-                              }) */
-      } else if (res.data.code == 409) {
-        // getToken(url,date,type,header)
+        uni.clearStorageSync();
+        uni.navigateTo({
+          url: '../login/login' });
+
+      } else if (res.data.code == 0) {
+        // 正常
+        resolve(res.data);
       }
-      resolve(res.data);
+
     }).catch(function (error) {var _error = _slicedToArray(
       error, 2),err = _error[0],res = _error[1];
       reject(err);

operatingCompany/unpackage/dist/dev/mp-weixin/pages/accountSet/accountSet.wxss

@@ -29,7 +29,6 @@
 	width: 72rpx;
 	height: 72rpx;
 	margin-right: 20rpx;
-	background-color: #007AFF;
 }
 .leftTitle {
 	font-size: 28rpx;

operatingCompany/unpackage/dist/dev/mp-weixin/pages/logIn/logIn.wxss

@@ -1,49 +1,90 @@
 
 .content {
-	background-color: #F4F5F7;
+	background-color: #FFFFFF;
 	min-height: 100vh;
-	padding: 20rpx 24rpx;
 }
-.messageBg,
-.sureBtn {
-	background-color: #FFFFFF;
-	border-radius: 10rpx;
-	margin: 20rpx 0rpx;
+.topImg {
+	padding-left: 152rpx;
+	height: 256rpx;
 }
-.message {
+.roleSelect {
+	padding: 24rpx 48rpx;
 	display: -webkit-box;
 	display: -webkit-flex;
 	display: flex;
-	-webkit-box-pack: start;
-	-webkit-justify-content: flex-start;
-	        justify-content: flex-start;
-	line-height: 98rpx;
-	-webkit-box-align: center;
-	-webkit-align-items: center;
-	        align-items: center;
-}
-.line {
-	border-bottom: 1rpx solid #EEEEEE;
-}
-.leftTitle {
+	-webkit-box-pack: justify;
+	-webkit-justify-content: space-between;
+	        justify-content: space-between;
+	text-align: center;
+}
+.role_S {
+	color: #FF4F00;
 	font-size: 28rpx;
+	border: 2rpx #FF4F00 solid;
+	border-radius: 50rpx;
+	height: 88rpx;
+	width: 41%;
+	line-height: 88rpx;
+}
+.role_N {
 	color: #3C3C3C;
-	margin-left: 20rpx;
-	width: 140rpx;
+	font-size: 28rpx;
+	background-color: #F4F5F7;
+	border-radius: 50rpx;
+	height: 88rpx;
+	width: 41%;
+	line-height: 88rpx;
 }
-.passWord {
-	-webkit-box-flex: 1;
-	-webkit-flex-grow: 1;
-	        flex-grow: 1;
+.phone,
+.codeBg {
+	margin: 0rpx 48rpx;
+	padding-top: 48rpx;
+	padding-bottom: 22rpx;
+	color: #3C3C3C;
 	font-size: 28rpx;
+	border-bottom: 2rpx #F4F5F7 solid;
+}
+.codeBg {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: justify;
+	-webkit-justify-content: space-between;
+	        justify-content: space-between;
+}
+.logInBtn_S {
+	margin: 50rpx 48rpx;
+	width: 100vw-96rpx;
+	height: 88rpx;
+	border-radius: 50rpx;
+	background-color: #FF8700;
+	color: #FFFFFF;
+	font-size: 30rpx;
+	font-weight: bold;
+	line-height: 88rpx;
+	text-align: center;
+}
+.logInBtn_N {
+	margin: 50rpx 48rpx;
+	width: 100vw-96rpx;
+	height: 88rpx;
+	border-radius: 50rpx;
+	background-color: #F4F5F7;
 	color: #999999;
-	margin-left: 52rpx;
-	margin-right: 20rpx;
+	font-size: 30rpx;
+	font-weight: bold;
+	line-height: 88rpx;
+	text-align: center;
 }
-.sureBtn {
-	line-height: 98rpx;
+.logOutBtn {
+	position: fixed;
+	bottom: 130rpx;
+	left: 275rpx;
+	width: 200rpx;
+	height: 42rpx;
 	text-align: center;
-	color: #FFFFFF;
-	background-color: #FF8700;
+	line-height: 42rpx;
+	font-size: 30rpx;
+	color: #999999;
 }
 

operatingCompany/unpackage/dist/dev/mp-weixin/project.config.json

@@ -8,7 +8,7 @@
   },
   "compileType": "miniprogram",
   "libVersion": "",
-  "appid": "touristappid",
+  "appid": "wx33053a645546ec31",
   "projectname": "operatingCompany",
   "condition": {
     "search": {