Merge branch 'dev' of http://47.101.131.235:3000/LiChengjin/MiniScm into dev

App.vue

@@ -22,6 +22,10 @@
 	// 设置整个项目的背景色
 	page {
 		background-color: #f5f5f5;
+		width: 100%;
+		height: 100%;
+		margin: 0;
+		border: 0;
 	}
 
 	/* #endif */

pages.json

@@ -7,42 +7,62 @@
     {
       "path": "pages/login/login",
       "style": {
-        "navigationBarTitleText": "源享住平台登录"
+        "navigationBarTitleText": "源享住平台登录",
+        "mp-weixin":{
+          "navigationBarTextStyle": "black",
+          "navigationBarBackgroundColor": "#F8F8F8"
+         }
       }
     },
     {
       "path": "pages/home/home",
       "style": {
-        "navigationBarTitleText": "柏源酒店"
+        "navigationBarTitleText": "柏源酒店",
+        "mp-weixin":{
+          "navigationBarTextStyle": "black",
+          "navigationBarBackgroundColor": "#F8F8F8"
+         }
       }
     },
     {
       "path": "pages/order/order",
       "style": {
-        "navigationBarTitleText": "我的订单"
+        "navigationBarTitleText": "我的订单",
+        "mp-weixin":{
+          "navigationBarTextStyle": "black",
+          "navigationBarBackgroundColor": "#F8F8F8"
+         }
       }
     },
     {
       "path": "pages/my/my",
       "style": {
-        "navigationBarTitleText": "个人中心"
+        "navigationBarTitleText": "个人中心",
+        "mp-weixin":{
+          "navigationBarTextStyle": "black",
+          "navigationBarBackgroundColor": "#F8F8F8"
+         }
       }
     },
     {
       "path": "mp_ecard_sdk/index/index",
       "style": {
-        "navigationBarTitleText": "腾讯云E证通授权"
+        "navigationBarTitleText": "腾讯云E证通授权",
+        "mp-weixin":{
+          "navigationBarTextStyle": "black",
+          "navigationBarBackgroundColor": "#F8F8F8"
+         }
       }
     }
   ],
   "globalStyle": {
-    "navigationBarTextStyle": "black",
-    // "navigationBarTitleText": "柏源平台",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8",
-    "app-plus": {
-      "background": "#efeff4"
-    }
+    // "navigationBarTextStyle": "black",
+    // // "navigationBarTitleText": "柏源平台",
+    // "navigationBarBackgroundColor": "#F8F8F8",
+    // "backgroundColor": "#F8F8F8",
+    // "app-plus": {
+    //   "background": "#efeff4"
+    // }
   },
   "tabBar": {
     "selectedColor": "#6789F0",
@@ -75,70 +95,110 @@
           "path": "myAccount/myAccount",
           "style": {
             "navigationBarTitleText": "我的账户",
-            "enablePullDownRefresh": false
+            "enablePullDownRefresh": false,
+            "mp-weixin":{
+              "navigationBarTextStyle": "black",
+              "navigationBarBackgroundColor": "#F8F8F8"
+             }
           }
         },
         {
           "path": "updateName/updateName",
           "style": {
             "navigationBarTitleText": "修改姓名",
-            "enablePullDownRefresh": false
+            "enablePullDownRefresh": false,
+            "mp-weixin":{
+              "navigationBarTextStyle": "black",
+              "navigationBarBackgroundColor": "#F8F8F8"
+             }
           }
         },
         {
           "path": "updateIdNumber/updateIdNumber",
           "style": {
             "navigationBarTitleText": "修改证件号",
-            "enablePullDownRefresh": false
+            "enablePullDownRefresh": false,
+            "mp-weixin":{
+              "navigationBarTextStyle": "black",
+              "navigationBarBackgroundColor": "#F8F8F8"
+             }
           }
         },
         {
           "path": "checkin/checkin",
           "style": {
             "navigationBarTitleText": "入住办理",
-            "enablePullDownRefresh": false
+            "enablePullDownRefresh": false,
+            "mp-weixin":{
+              "navigationBarTextStyle": "black",
+              "navigationBarBackgroundColor": "#F8F8F8"
+             }
           }
         },
         {
           "path": "checkout/checkout",
           "style": {
             "navigationBarTitleText": "退房办理",
-            "enablePullDownRefresh": false
+            "enablePullDownRefresh": false,
+            "mp-weixin":{
+              "navigationBarTextStyle": "black",
+              "navigationBarBackgroundColor": "#F8F8F8"
+             }
           }
         },
         {
           "path": "extend/extend",
           "style": {
             "navigationBarTitleText": "续住办理",
-            "enablePullDownRefresh": false
+            "enablePullDownRefresh": false,
+            "mp-weixin":{
+              "navigationBarTextStyle": "black",
+              "navigationBarBackgroundColor": "#F8F8F8"
+             }
           }
         },
         {
           "path": "changeRoom/changeRoom",
           "style": {
             "navigationBarTitleText": "换房办理",
-            "enablePullDownRefresh": false
+            "enablePullDownRefresh": false,
+            "mp-weixin":{
+              "navigationBarTextStyle": "black",
+              "navigationBarBackgroundColor": "#F8F8F8"
+             }
           }
         },
         {
           "path": "selectRoomType/selectRoomType",
           "style": {
             "navigationBarTitleText": "房源类型",
-            "enablePullDownRefresh": false
+            "enablePullDownRefresh": false,
+            "mp-weixin":{
+              "navigationBarTextStyle": "black",
+              "navigationBarBackgroundColor": "#F8F8F8"
+             }
           }
         },
         {
           "path": "selectRoom/selectRoom",
           "style": {
             "navigationBarTitleText": "",
-            "enablePullDownRefresh": false
+            "enablePullDownRefresh": false,
+            "mp-weixin":{
+              "navigationBarTextStyle": "black",
+              "navigationBarBackgroundColor": "#F8F8F8"
+             }
           }
         },
         {
           "path": "emergencyKey/emergencyKey",
           "style": {
             "navigationBarTitleText": "紧急钥匙",
-            "enablePullDownRefresh": false
+            "enablePullDownRefresh": false,
+            "mp-weixin":{
+              "navigationBarTextStyle": "black",
+              "navigationBarBackgroundColor": "#F8F8F8"
+             }
           }
         },
         {
@@ -146,7 +206,11 @@
         	"style" : 
         	{
         		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
+        		"enablePullDownRefresh" : false,
+            "mp-weixin":{
+              "navigationBarTextStyle": "black",
+              "navigationBarBackgroundColor": "#F8F8F8"
+             }
         	}
         },
         {
@@ -154,7 +218,11 @@
         	"style" : 
         	{
         		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
+        		"enablePullDownRefresh" : false,
+            "mp-weixin":{
+              "navigationBarTextStyle": "black",
+              "navigationBarBackgroundColor": "#F8F8F8"
+             }
         	}
         },
         {
@@ -162,7 +230,11 @@
         	"style" : 
         	{
         		"navigationBarTitleText" : "添加入住人",
-        		"enablePullDownRefresh" : false
+        		"enablePullDownRefresh" : false,
+            "mp-weixin":{
+              "navigationBarTextStyle": "black",
+              "navigationBarBackgroundColor": "#F8F8F8"
+             }
         	}
         },
         {
@@ -170,7 +242,11 @@
         	"style" : 
         	{
         		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
+        		"enablePullDownRefresh" : false,
+            "mp-weixin":{
+              "navigationBarTextStyle": "black",
+              "navigationBarBackgroundColor": "#F8F8F8"
+             }
         	}
         },
         {
@@ -178,7 +254,11 @@
         	"style" : 
         	{
         		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
+        		"enablePullDownRefresh" : false,
+            "mp-weixin":{
+              "navigationBarTextStyle": "black",
+              "navigationBarBackgroundColor": "#F8F8F8"
+             }
         	}
         }
       ]

pages/login/login.vue

@@ -1,8 +1,9 @@
 <template>
 	<view class="wrap">
 		<view class="top-background"> </view>
-		<uni-card class="login-card" note="Tips">
-			<text class="card-text">欢迎使用源享住</text>
+		<view class="login">
+			<uni-card class="login-card" note="Tips">
+			<text class="card-text" style="font-size: 40rpx; font-weight: bold; color: #7096f6; margin: 40rpx auto; display: block; text-align: center;">欢迎使用源享住</text>
 			<u-form>
 				<view class="card-item">
 					<u-form-item class="">
@@ -10,12 +11,13 @@
 							clearable></u-input>
 					</u-form-item>
 				</view>
-				<view class="card-item"><u-form-item class="user-input">
-						<view class="password-input">
+				<view class="card-item">
+					<u-form-item class="user-input">
+						<view class="password-input" style="margin-top: 15px;">
 							<u-input prefixIcon="lock" placeholder="请输入验证码" shape="circle" v-model="verificationCode">
 								<template slot="suffix">
 									<u-code ref="uCode" @change="codeChange" seconds="60"></u-code>
-									<u-button class="verification-btn" @click="getVerificationCode" color="#698FF2"
+									<u-button class="verification-btn" @click="getVerificationCode" color="#698FF2" style="width: 300rpx;"
 										shape="circle" size="mini">{{ tips }}</u-button>
 								</template>
 							</u-input>
@@ -23,10 +25,11 @@
 					</u-form-item>
 				</view>
 			</u-form>
-			<view class="card-item card-btn">
+			<view class="card-item card-btn" style="margin: 40rpx auto;">
 				<u-button @click="login" text="登录" shape="circle" color="#698FF2"></u-button>
 			</view>
 		</uni-card>
+		</view>
 	</view>
 </template>
 
@@ -156,16 +159,19 @@
 </script>
 
 <style lang="scss" scoped>
+page {
+	width: 100%;
+	height: 100%;
 	.wrap {
 		font-size: 28rpx;
+		height: 100%;
 
 		.top-background {
 			display: block;
 			height: 35vh;
 			background-color: #6e94f5;
 		}
-
-		.login-card {
+		.login{
 			transform: translateY(-30%);
 			height: 650rpx;
 			width: 600rpx;
@@ -174,36 +180,47 @@
 			border-radius: 25rpx;
 			box-shadow: 5px 5px 5px gray;
 			display: flex;
-			text-align: center;
-			flex-direction: column;
+			align-items: center;
+			justify-content: center;
 
-			.card-text {
-				font-size: 40rpx;
-				font-weight: bold;
-				color: #7096f6;
-				margin: 40rpx auto;
-				display: block;
-			}
+			.login-card {
+				height: 100%;
+				display: flex;
+				text-align: center;
+				flex-direction: column;
 
-			.card-item {
-				width: 100%;
-				margin: 0 auto;
+				.card-text {
+					font-size: 40rpx;
+					font-weight: bold;
+					color: #7096f6;
+					margin: 40rpx auto;
+					display: block;
+				}
 
-				.password-input {
-					margin-top: 15px;
+				.card-item {
+					width: 100%;
+					margin: 0 auto;
+
+					.password-input {
+						margin-top: 15px;
+					}
 				}
-			}
 
-			.card-item:first-child {
-				margin-top: 40rpx;
-			}
+				.card-item:first-child {
+					margin-top: 40rpx;
+				}
+
+				.card-btn {
+					margin: 80rpx auto;
+				}
+		}
 
-			.card-btn {
-				margin: 80rpx auto;
-			}
 		}
+		
 	}
 
+}
+	
 	.verification-btn {
 		width: 300rpx;
 	}