Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x

pages.json

@@ -69,7 +69,9 @@
 		{
 			"path": "pages/login/login",
 			"style": {
-				"navigationBarTitleText": "登录"
+				"navigationBarTitleText": "登录",
+				"enablePullDownRefresh": false,
+				"disableScroll": true
 			}
 		},
 		{
@@ -110,7 +112,7 @@
 			"style": {
 				"navigationBarTitleText": "会员列表"
 			}
-		},{
+		}, {
 			"path": "pages/make/make",
 			"style": {
 				"navigationBarTitleText": "在线预定"
@@ -232,19 +234,17 @@
 			}
 		},
 		{
-			"path" : "pages/member/memberdetails",
-			"style" : 
-			{
-				"navigationBarTitleText" : "会员卡"
+			"path": "pages/member/memberdetails",
+			"style": {
+				"navigationBarTitleText": "会员卡"
 			}
 		},
 		{
-			"path" : "pages/member/billDetails",
-			"style" : 
-			{
-				"navigationBarTitleText" : "账单明细"
+			"path": "pages/member/billDetails",
+			"style": {
+				"navigationBarTitleText": "账单明细"
 			}
-		}		
+		}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/login/login.vue

@@ -2,7 +2,6 @@
 	<view class="container">
 		<view class="box flex-center">
 			<!-- <text>欢迎登录零点八零</text> -->
-
 			<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/Logo" mode=""></image>
 		</view>
 		<view class="top_box">
@@ -131,8 +130,9 @@
 		mounted() {
 			this.computed_h();
 		},
-
 		onLoad(e) {
+
+
 			console.log(e)
 			try {
 				this.types = e.type
@@ -288,7 +288,8 @@
 					if (this.types == 0) {
 						uni.reLaunch({
 							url: '/pages/order_food/order_food'
-						});sss
+						});
+						sss
 					} else {
 						// uni.cache.set('shopUser', res.data.shopUser);
 						uni.pro.switchTab('index/index')
@@ -352,11 +353,9 @@
 										}
 									}
 								},
-								fail: (err) => {
-								}
+								fail: (err) => {}
 							});
-						} catch (e) {
-						}
+						} catch (e) {}
 					}
 				});
 				// #endif
@@ -373,7 +372,13 @@
 	}
 
 	.container {
-		position: relative;
+		// position: relative;
+		  position: fixed;
+		  top: 0;
+		  left: 0;
+		  width: 100%;
+		  height: 100vh;
+		  overflow: hidden;
 
 		.top {
 			position: absolute;
@@ -385,8 +390,12 @@
 		}
 
 		.box {
-			padding-top: 110rpx;
-
+			// padding-top: 110rpx;
+			position: fixed;
+			top: 110rpx;
+			left: 50%;
+			z-index: 22;
+			transform: translateX(-50%);
 			image {
 				width: 128rpx;
 				height: 128rpx;
@@ -501,7 +510,7 @@
 			align-items: center;
 			background: #ffffff;
 			border-radius: 40rpx 40rpx 0px 0px;
-
+			top: 220rpx;
 			.top_box_one {
 				position: relative;
 				width: 100%;