提交

App.vue

@@ -1,5 +1,8 @@
 <script>
 import store from "@/config/store";
+// #ifdef H5
+import { h5Login } from "@/config/html5Utils";
+// #endif
 // #ifdef APP-PLUS
 import APPUpdate from "@/utils/APPUpdate";
 // #endif

pages.json

@@ -53,6 +53,12 @@
 			"style": {
 				"navigationBarTitleText": "注册"
 			}
+		},
+		{
+			"path": "pages/user/login",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
 		}
 	],
 	"globalStyle": {

pages/user/bindPhone.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<nav-bar title="绑定手机号"></nav-bar>
 		<view class="bindAccountBox">
 			<image :src="logoUrl"></image>
 			<view><image src="../../static/icon/bindingIcon.png"></image></view>

pages/user/forget.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="page">
+		<nav-bar></nav-bar>
 		<view class="title">忘记密码</view>
 		<view class="input_box"><input type="number" v-model="phone" placeholder="请输入手机号" /></view>
 		<view class="input_box">

pages/user/login.vue

@@ -1,7 +1,10 @@
 <template>
 	<view class="register_page">
-		<view class="title" v-if="type == 1000">验证码登录</view>
-		<view class="title" v-if="type == 2000">账号密码</view>
+		<nav-bar></nav-bar>
+		<view class="title">
+			<text :class="{active:type == 2000}" @click="type = 2000">密码登录</text>
+			<text :class="{active:type == 1000}" @click="type = 1000">验证码登录</text>
+		</view>
 		<view class="input_box"><input type="number" v-model="phone" placeholder="请输入您的手机号码" maxlength="11" /></view>
 		<view class="input_box" v-if="type == 1000">
 			<input type="number" v-model="code" placeholder="请输入手机验证码" maxlength="6" @confirm="onSubmit" />
@@ -20,10 +23,6 @@
 			<text class="color" @click="onPageJump('/pages/user/register')">去注册</text>
 			<text @click="onPageJump('/pages/user/forget')">忘记密码？</text>
 		</view>
-		<view class="password_register">
-			<text v-if="type == 1000" @click="type = 2000">账户密码登录</text>
-			<text v-if="type == 2000" @click="type = 1000">短信验证码登录</text>
-		</view>
 		<!-- #ifdef APP-PLUS -->
 		<view class="station"></view>
 		<view class="third_party_login_box">
@@ -229,9 +228,21 @@ export default {
 	background-color: #fff;
 	min-height: 100vh;
 	.title {
-		font-size: 54upx;
-		color: #333333;
 		margin-bottom: 50upx;
+		display: flex;
+		align-items: center;
+		text {
+			font-size: 36upx;
+			color: #999;
+			&.active {
+				font-size: 48upx;
+				color: #333333;
+				font-weight: bold;
+			}
+			&:nth-child(2){
+				margin-left: 70upx;
+			}
+		}
 	}
 	.input_box {
 		display: flex;
@@ -274,7 +285,7 @@ export default {
 		font-size: 24upx;
 		color: #999999;
 		> text {
-			@include theme('font');
+			color: $themeColor;
 		}
 	}
 	.password_register {
@@ -294,7 +305,7 @@ export default {
 			font-size: 24upx;
 			color: #333333;
 			&.color {
-				@include theme('font');
+				color: $themeColor;
 			}
 		}
 	}

pages/user/protocol.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="protocol_page">
+		<nav-bar title="协议"></nav-bar>
 		<view class="title">{{title}}</view>
 		<u-parse :content="protocol" />
 	</view>

pages/user/register.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="page">
+		<nav-bar></nav-bar>
 		<view class="title">注册</view>
 		<view class="input_box"><input type="number" v-model="phone" placeholder="请输入手机号" /></view>
 		<view class="input_box">

style/mixin.scss

@@ -2,26 +2,14 @@
 //主色
 $themeColor: #85d764;
 @mixin theme($type,$path:''){
-	@if $type == "font" {
-		color: $themeColor;
-	} @else if $type == "bg" {
-		background-color: $themeColor;
-	} @else if $type == "border" {
-		border: solid 2upx $themeColor;
-	} @else if $type == "gradient_bg" {
+	@if $type == "gradient_bg" {
 		background-image: linear-gradient(90deg, #ea552d 0%, #f19837 100%);
-	} @else if $type == "btn_bg" {
-		background-color: $themeColor;
-	} @else if $type == "address_img" {
-		background-image: url($path + "static/icon/orderdetails_ads.png");
 	} @else if $type == "unselected_img" {
 		background-image: url($path + "static/icon/ic_gender_unselected.png");
 	} @else if $type == "check_img" {
 		background-image: url($path + "static/icon/ic_agreed.png");
 	} @else if $type == "radio_img" {
 		background-image: url($path + "static/icon/ic_gender_selected.png");
-	} @else if $type == "my_head_img" {
-		background-image: url($path + "static/icon/mime_bg_top.png");
 	}
 }
 // 背景图片地址和大小

utils/utils.js

@@ -1,4 +1,4 @@
-import $http from '@/config/request'
+import $http from '@/config/requestConfig'
 import store from '@/config/store';
 // #ifdef APP-PLUS
 import { judgePermission } from '@/utils/permission'