diff --git a/README.md b/README.md
index 5947b1f..da5e336 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,16 @@ src -- 源码目录
 - 微信开发者工具开启服务端口：`设置->安全设置>服务端口开启`
 - 在`HBuilder X`中使用`运行->运行到小程序模拟器->微信开发者工具`运行项目，运行成功后会自动打开微信开发者工具并编译项目
 
+## 开发须知
+
+- 登录相关    
+* 接口地址：39.103.180.196:9012
+* 接口文档：[luoo-user API](http://39.103.180.196:9012/doc.html?open_in_browser=true)
+
+- 商城相关
+* 接口地址：43.248.137.154:8085
+* 接口文档：[mall前台系统](http://43.248.137.154:8085/swagger-ui/index.html)
+
 
 ## 许可证
 
diff --git a/manifest.json b/manifest.json
index 60596d1..d5f62f6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -59,7 +59,8 @@
         "appid" : "",
         "setting" : {
             "urlCheck" : true
-        }
+        },
+		"darkmode" : true
     },
     "h5" : {
         "devServer" : {
diff --git a/pages/product/product.vue b/pages/product/product.vue
index 3831e25..6387760 100644
--- a/pages/product/product.vue
+++ b/pages/product/product.vue
@@ -216,7 +216,7 @@
 </template>
 
 <script>
-	import share from '@/components/share';
+	import share from '@/components/share.vue';
 	import {
 		fetchProductDetail
 	} from '@/api/product.js';
diff --git a/pages/public/login.vue b/pages/public/login.vue
index f1726a6..d0831fa 100644
--- a/pages/public/login.vue
+++ b/pages/public/login.vue
@@ -48,8 +48,8 @@
 			}
 		},
 		onLoad() {
-			this.username = uni.getStorageSync('username') || '';
-			this.password = uni.getStorageSync('password') || '';
+			this.username = uni.getStorageSync('username') || 'member';
+			this.password = uni.getStorageSync('password') || 'member123';
 		},
 		methods: {
 			...mapMutations(['login']),
diff --git a/pages/public/register.vue b/pages/public/register.vue
index cec8b7e..04a1a1b 100644
--- a/pages/public/register.vue
+++ b/pages/public/register.vue
@@ -1,24 +1,53 @@
 <template>
 	<view class="container">
-		<view class="left-bottom-sign"></view>
+		<view class="bottom-sign">
+			<image v-if="theme" :src="`/static/public/login_bg_${theme}.png`"></image>
+		</view>
 		<view class="back-btn yticon icon-zuojiantou-up" @click="navBack"></view>
-		<view class="right-top-sign"></view>
-		<!-- 设置白色背景防止软键盘把下部绝对定位元素顶上来盖住输入框等 -->
 		<view class="wrapper">
-			<view class="empty">
-				
+			<view class="tips">
+				<view class="tips_title">{{tips.title}}</view>
+				<view class="tips_text">{{tips.text}}</view>
+			</view>
+			<view class="input_box">
+				<view class="area_select">
+					<view class="area">+86</view>
+					<image class="icon_down" src="@/static/icons/icon_down.png"></image>
+				</view>
+				<input type="number" maxlength="11" placeholder="输入手机号" />
+				<image class="icon_clear" src="@/static/icons/icon_clear.png"></image>
+			</view>
+			<button class="confirm-btn">获取短信验证码</button>
+			<view class="checkbox_box">
+				<label class="radio">
+					<radio value="r1" checked="true" />已阅读并同意《用户协议》、《隐私政策》
+				</label>
+			</view>
+			<view class="login_icon">
+				<image class="wechat" src="@/static/icons/icon_wechat.png"></image>
+				<image class="apple" src="@/static/icons/icon_apple.png"></image>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	export default {
 		data() {
-			return {}
+			return {
+				tips: {
+					title: '注册/登录',
+					text: '输入手机号，开启雀乐；未注册手机，将自动注册'
+				}
+			}
 		},
-		onLoad() {
+		computed: {
+			...mapState(['theme'])
 		},
+		onLoad() {},
 		methods: {
 			navBack() {
 				uni.navigateBack();
@@ -28,110 +57,150 @@
 	}
 </script>
 
-<style lang='scss'>
-	page {
-		background: #fff;
-	}
-	
-	.empty {
-		position: fixed;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100vh;
-		padding-bottom: 100upx;
-		display: flex;
-		justify-content: center;
-		flex-direction: column;
-		align-items: center;
-		background: #fff;
-	
-		image {
-			width: 420upx;
-			height: 420upx;
-			margin-bottom: 30upx;
-		}
-		.empty-tips {
-			display: flex;
-			font-size: $font-sm+16upx;
-			color: $font-color-disabled;
-		
-			.navigator {
-				color: $uni-color-primary;
-				margin-left: 0upx;
-			}
-		}
-	}
-
+<style lang='scss' scoped>
 	.container {
-		padding-top: 115px;
 		position: relative;
 		width: 100vw;
 		height: 100vh;
 		overflow: hidden;
-		background: #fff;
-	}
 
-	.wrapper {
-		position: relative;
-		z-index: 90;
-		background: #fff;
-		padding-bottom: 40upx;
-	}
-
-	.back-btn {
-		position: absolute;
-		left: 40upx;
-		z-index: 9999;
-		padding-top: var(--status-bar-height);
-		top: 40upx;
-		font-size: 40upx;
-		color: $font-color-dark;
-	}
-
-	.left-top-sign {
-		font-size: 120upx;
-		color: $page-color-base;
-		position: relative;
-		left: -16upx;
-	}
+		.bottom-sign {
+			position: fixed;
+			left: 0;
+			bottom: 0;
+			width: 100vw;
+			height: 100vw;
 
-	.right-top-sign {
-		position: absolute;
-		top: 80upx;
-		right: -30upx;
-		z-index: 95;
-
-		&:before,
-		&:after {
-			display: block;
-			content: "";
-			width: 400upx;
-			height: 80upx;
-			background: #b4f3e2;
+			image {
+				width: 100%;
+				height: 100%;
+			}
 		}
 
-		&:before {
-			transform: rotate(50deg);
-			border-radius: 0 50px 0 0;
+		.back-btn {
+			position: absolute;
+			left: 40upx;
+			padding-top: var(--status-bar-height);
+			top: 40upx;
+			font-size: 40upx;
+			color: $font-color-dark;
 		}
 
-		&:after {
-			position: absolute;
-			right: -198upx;
-			top: 0;
-			transform: rotate(-50deg);
-			border-radius: 50px 0 0 0;
-			/* background: pink; */
+		.wrapper {
+			position: relative;
+			padding-top: 200upx;
+
+			.tips {
+				width: 100%;
+				height: 136upx;
+				padding: 0 48rpx;
+
+				.tips_title {
+					font-size: 64upx;
+					margin-bottom: 26upx;
+				}
+
+				.tips_text {
+					font-size: 28upx;
+				}
+			}
+
+			.input_box {
+				display: flex;
+				align-items: center;
+				padding: 88upx 48upx;
+				position: relative;
+
+				.area_select {
+					display: flex;
+					align-items: center;
+
+					.area {
+						font-size: 34upx;
+					}
+
+					.icon_down {
+						width: 48upx;
+						height: 48upx;
+						margin: 0 23upx 0 14upx;
+					}
+				}
+
+				input {
+					font-size: 34upx;
+					border-left: 2upx solid rgba(0, 0, 0, 0.4);
+					padding-left: 54upx;
+				}
+
+				.icon_clear {
+					width: 48upx;
+					height: 48upx;
+					position: absolute;
+					right: 48upx;
+					top: 50%;
+					margin-top: -24upx;
+				}
+
+			}
+
+			.confirm-btn {
+				width: 566upx;
+				height: 88upx;
+				line-height: 88upx;
+				border-radius: 999px;
+				background: #C43737;
+				color: #fff;
+				font-size: $font-lg;
+
+				&:after {
+					border-radius: 100px;
+				}
+			}
+
+			.checkbox_box {
+				padding: 42upx;
+
+				.radio {
+					font-size: 24upx;
+				}
+
+				radio {
+					transform: scale(0.7)
+				}
+			}
+
+			.login_icon {
+				padding-top: 32upx;
+				display: flex;
+				justify-content: center;
+
+				image {
+					width: 92upx;
+					height: 92upx;
+				}
+
+				image.wechat {
+					margin-right: 24upx;
+				}
+
+				image.apple {
+					margin-left: 24upx;
+				}
+			}
 		}
+
+
 	}
 
-	.left-bottom-sign {
-		position: absolute;
-		left: -270upx;
-		bottom: -320upx;
-		border: 100upx solid #d0d1fd;
-		border-radius: 50%;
-		padding: 180upx;
+	/* 暗黑模式 */
+	@media (prefers-color-scheme: dark) {
+		.container {
+			 .wrapper .input_box input {
+				border-left: 2upx solid #fff;
+			}
+			.back-btn {
+				color: #fff;
+			}
+		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/static/icons/icon_apple.png b/static/icons/icon_apple.png
new file mode 100644
index 0000000..ecfeb8b
Binary files /dev/null and b/static/icons/icon_apple.png differ
diff --git a/static/icons/icon_clear.png b/static/icons/icon_clear.png
new file mode 100644
index 0000000..8c82e85
Binary files /dev/null and b/static/icons/icon_clear.png differ
diff --git a/static/icons/icon_down.png b/static/icons/icon_down.png
new file mode 100644
index 0000000..fa98a13
Binary files /dev/null and b/static/icons/icon_down.png differ
diff --git a/static/icons/icon_wechat.png b/static/icons/icon_wechat.png
new file mode 100644
index 0000000..a3feaf9
Binary files /dev/null and b/static/icons/icon_wechat.png differ
diff --git a/static/icons/left_back.png b/static/icons/left_back.png
new file mode 100644
index 0000000..71260f2
Binary files /dev/null and b/static/icons/left_back.png differ
diff --git a/static/icons/left_back@2x.png b/static/icons/left_back@2x.png
new file mode 100644
index 0000000..f56612b
Binary files /dev/null and b/static/icons/left_back@2x.png differ
diff --git a/static/icons/left_back@3x.png b/static/icons/left_back@3x.png
new file mode 100644
index 0000000..1e7f04d
Binary files /dev/null and b/static/icons/left_back@3x.png differ
diff --git a/static/public/login_bg_dark.png b/static/public/login_bg_dark.png
new file mode 100644
index 0000000..95106dd
Binary files /dev/null and b/static/public/login_bg_dark.png differ
diff --git a/static/public/login_bg_light.png b/static/public/login_bg_light.png
new file mode 100644
index 0000000..a9c4eaf
Binary files /dev/null and b/static/public/login_bg_light.png differ
diff --git a/store/index.js b/store/index.js
index 3d2a508..7e0aac8 100644
--- a/store/index.js
+++ b/store/index.js
@@ -7,6 +7,7 @@ const store = new Vuex.Store({
 	state: {
 		hasLogin: false,
 		userInfo: {},
+		theme: uni.getSystemInfoSync().theme
 	},
 	mutations: {
 		login(state, provider) {
@@ -28,6 +29,9 @@ const store = new Vuex.Store({
 			uni.removeStorage({
 			    key: 'token'  
 			})
+		},
+		changeTheme(state, theme) {
+			state.theme = theme
 		}
 	},
 	actions: {
diff --git a/theme.json b/theme.json
new file mode 100644
index 0000000..bbc1fd5
--- /dev/null
+++ b/theme.json
@@ -0,0 +1,24 @@
+{
+	"light": {
+		"navigationBarTextStyle": "black",
+		"navigationBarBackgroundColor": "#F7F7F7",
+		"backgroundColor": "#F7F7F7",
+
+		"tabBarColor": "#7A7E83",
+		"tabBarSelectedColor": "#3cc51f",
+		"tabBarBorderStyle": "black",
+		"tabBarBackgroundColor": "#F7F7F7"
+		
+	},
+	"dark": {
+		"navigationBarTextStyle": "white",
+		"navigationBarBackgroundColor": "#1F1F1F",
+		"backgroundColor": "#1F1F1F",
+
+		"tabBarColor": "#cacaca",
+		"tabBarSelectedColor": "#51A937",
+		"tabBarBorderStyle": "white",
+		"tabBarBackgroundColor": "#1F1F1F"
+		
+	}
+}
diff --git a/utils/appConfig.js b/utils/appConfig.js
index c69c25d..594dc23 100644
--- a/utils/appConfig.js
+++ b/utils/appConfig.js
@@ -1,7 +1,7 @@
 // appConfig.js
 
 //配置API请求的基础路径
-// export const API_BASE_URL = 'http://localhost:8085';
-export const API_BASE_URL = 'https://portal-api.macrozheng.com';
+export const API_BASE_URL = 'http://43.248.137.154:8085';
+// export const API_BASE_URL = 'https://portal-api.macrozheng.com';
 //是否启用支付宝支付
-export const USE_ALIPAY = false;
\ No newline at end of file
+export const USE_ALIPAY = true;
\ No newline at end of file