Merge branch 'master' of https://gitee.com/tpcaicjx/purchase

pages.json

@@ -21,7 +21,16 @@
 				"navigationBarTitleText": "分站搭建"
 			}
 		}
-	],
+	    ,{
+            "path" : "pages/login/login",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "登录",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

pages/login/login.vue

@@ -0,0 +1,39 @@
+<template>
+	<view>
+		<view>欢迎来到在线下单</view>
+		<view>
+			<span>又</span>
+			酷
+			<span>又</span>
+			靠谱的
+		</view>
+		<view>赚钱神器</view>
+		<u-button type="primary" class="login-btn">
+			<image src="../../static/img/login_slices/dl_icon_wx@2x.png" style="width: 52rpx; height: 42rpx;"></image>
+			<text>微信快捷登录</text>
+		</u-button>
+		<u-button class="login-btn">密码登录</u-button>
+		<u-button class="login-btn">手机号码登录</u-button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.login-btn{
+	width: 630rpx;
+	height: 96rpx;
+	border-radius: 48rpx;
+}
+</style>