登录页

apis/request.js

@@ -12,7 +12,7 @@ const request = options => {
 		})
 	}
 	const header = Object.assign({}, config.headers, {
-		token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjUzMjcyMjMyLCJleHAiOjE2NTMzMTU0MzIsImFjY291bnRJZCI6IjEifQ.gf5myNnrLmVjUcIWfqfohWyvdPXXwr9butZo75CXk64'
+		token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjUzMzU5NTQwLCJleHAiOjE2NTM0MDI3NDAsImFjY291bnRJZCI6IjEifQ._dqfOSY8Gr6O0BFXxP17CI7zzJY9MHmfzj3876zc21s'
 	})
 	return new Promise((resolve, reject)=>{
 		uni.request({

pages.json

@@ -1,10 +1,16 @@
 {
 	"pages": [
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "首页"
+			}
+		},
         {
-            "path" : "pages/invite/invite",
+            "path" : "pages/login/login",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "加入团队",
+                "navigationBarTitleText": "登录",
                 "enablePullDownRefresh": false
             }
         },
@@ -16,6 +22,14 @@
                 "enablePullDownRefresh": true
             }
         },
+        {
+            "path" : "pages/invite/invite",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "加入团队",
+                "enablePullDownRefresh": false
+            }
+        },
         {
             "path" : "pages/orderDetail/orderDetail",
             "style" :                                                                                    
@@ -72,12 +86,6 @@
                 "enablePullDownRefresh": false
             }
         },
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "首页"
-			}
-		},
         {
             "path" : "pages/qrcode/qrcode",
             "style" :                                                                                    
@@ -143,15 +151,6 @@
                 "enablePullDownRefresh": false
             }
         }
-        ,{
-            "path" : "pages/login/login",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
     ],
 	"condition": { //模式配置，仅开发期间生效
 		"current": 0, //当前激活的模式（list 的索引项）

pages/login/login.vue

@@ -1,15 +1,21 @@
 <template>
 	<view class="page">
 		<view class="wrap">
-			<view class="hello">Hi，或然科技城市合伙人请登录备份</view>
+			<image class="logo" src="../../static/image/logo.png" mode=""></image>
+			<view class="hello">Hi，城市合伙人请登录</view>
 			<view class="btn wechat">
-				<image src="../../static/wechat.png" mode=""></image>
+				<image src="../../static/image/wechat.png" mode="widthFix"></image>
 				微信授权登录
 			</view>
 			<view class="btn phone">
-				<image src="../../static/phone.png" mode=""></image>
+				<image src="../../static/image/phone.png" mode="widthFix"></image>
 				手机账号登录
 			</view>
+			<view class="agree">
+				<uni-data-checkbox class="check" multiple v-model="agree" :localdata="agreeData"></uni-data-checkbox>
+				同意
+				<text>《或然科技城市合伙人服务协议》</text>
+			</view>
 		</view>
 	</view>
 </template>
@@ -18,7 +24,11 @@
 	export default {
 		data() {
 			return {
-				
+				agree: [],
+				agreeData: [{
+					text: '',
+					value: 0
+				}],
 			}
 		},
 		methods: {
@@ -29,9 +39,73 @@
 
 <style scoped lang="scss">
 .page {
-	background: url(../../static/login-bg.png) 0 0/100% 500px no-repeat;
+	min-height: calc(100vh - 170rpx);
+	padding-top: 170rpx;
+	background: url(../../static/image/login1.png) 0 0/175rpx auto no-repeat,
+		url(../../static/image/login2.png) bottom right/123rpx auto no-repeat;
+	overflow: hidden;
 }
 .wrap {
-	margin-top: 350px;
+	position: relative;
+	height: 60vh;
+	padding: 214rpx 74rpx 28rpx;
+	margin: 0 61rpx;
+	text-align: center;
+	background-color: #fff;
+	border-radius: 20rpx;
+	.logo {
+		width: 393rpx;
+		height: 93rpx;
+	}
+	.hello {
+		margin: 36rpx 0;
+		font-size: 28rpx;
+		color: #333;
+	}
+	.btn {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 100%;
+		height: 88rpx;
+		font-size: 32rpx;
+		border-radius: 10rpx;
+		image {
+			width: 50rpx;
+			margin-right: 15rpx;
+		}
+	}
+	.wechat {
+		margin-bottom: 38rpx;
+		color: #fff;
+		background-color: #007EFF;
+	}
+	.phone {
+		color: #007EFF;
+		border: 1px solid #007EFF;
+		image {
+			width: 40rpx;
+		}
+	}
+	.agree {
+		position: absolute;
+		bottom: 28rpx;
+		left: 0%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 100%;
+		text-align: center;
+		font-size: 24rpx;
+		color: #ccc;
+		text {
+			color: #007EFF;
+		}
+	}
+	/deep/.check {
+		.checklist-box {
+			margin: 0;
+		}
+	}
 }
 </style>

styles/common.scss

@@ -1,6 +1,9 @@
 button[type=primary] {
 	background-color: #007eff;
 }
+page {
+	height: 100%;
+}
 .block {
 	padding: 0 24rpx;
 	margin: 20rpx 24rpx;