lhl 2 år sedan
förälder
incheckning
664813b4d7

+ 18 - 8
api/login.js

@@ -1,13 +1,13 @@
 import request from '@/utils/request'
 
-// 登录
-export function login(data) {
-	return request({
-		url: '/api/login',
-		method: 'post',
-		data
-	});
-}
+// // 登录
+// export function login(data) {
+// 	return request({
+// 		url: '/api/login',
+// 		method: 'post',
+// 		data
+// 	});
+// }
 // 注册
 export function register(data) {
 	return request({
@@ -62,3 +62,13 @@ export function bangding(data) {
 		data
 	});
 }
+
+//
+export function gologin(data) {
+	return request({
+		url: '/api/Login/loginsubmit',
+		method: 'POST',
+		data
+	})
+}
+ 

+ 1 - 1
manifest.json

@@ -73,7 +73,7 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    "target" : "https://sc.manyuanchunjia.com/api",
+                    "target" : "http://heyu.frp.liuniu946.com",
                     // "changeOrigin": true,
                     "pathRewrite" : {
                         "/api" : "" // rewrite path

+ 2 - 12
pages.json

@@ -9,22 +9,12 @@
 		{
 			"path": "pages/public/register",
 			"style": {
-				"navigationBarTitleText": "注册",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
+				"navigationBarTitleText": "注冊"
 			}
 		}, {
 			"path": "pages/public/login",
 			"style": {
-				"navigationBarTitleText": "登录",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
+				"navigationBarTitleText": "登錄"
 			}
 		},
 		{

+ 178 - 36
pages/index/index.vue

@@ -1,37 +1,179 @@
-<template>
-	<view class="container">
-		
-	</view>
-</template>
-
-<script>
-
-export default {
-	data() {
-		return {
-			
-		};
-	},
-	computed: {
-
-	},
-	onLoad: function(option) {
-		
-	},
-	onShow: function() {
-		
-		
-	},
-	//下拉刷新
-	onPullDownRefresh() {
-		
-	},
-	methods: {
-	
-	}
-};
-</script>
-
-<style lang="scss">
-
+<template>
+	<view class="container">
+		<!-- 轮播图 start -->
+		<swiper class="top-swiper" autoplay="true" duration="400" interval="5000" @change="swiperChange">
+			<swiper-item v-for="(item, index) in 2" :key="index" class="carousel-item" @click="bannerNavToUrl(item)">
+				<image src="../../static/img/banner.png" />
+			</swiper-item>
+		</swiper>
+		<!-- 轮播图 end -->
+		<!-- 功能盒 start -->
+		<view class="gnh-wrap">
+			<view class="gnh-top flex">
+				<view class="top-item flex">
+					<image src="../../static/icon/gn-1.png" mode="" class=""></image>
+					<view class="">认购</view>
+				</view>
+				<view class="top-item flex">
+					<image src="../../static/icon/gn-2.png" mode="" class=""></image>
+					<view class="">充币</view>
+				</view>
+				<view class="top-item flex">
+					<image src="../../static/icon/gn-3.png" mode="" class=""></image>
+					<view class="">提币</view>
+				</view>
+				<view class="top-item flex">
+					<image src="../../static/icon/gn-4.png" mode="" class=""></image>
+					<view class="">语言</view>
+				</view>
+				<view class="top-item flex">
+					<image src="../../static/icon/gn-5.png" mode="" class=""></image>
+					<view class="">客服</view>
+				</view>
+			</view>
+			<view class="gnh-btm flex">
+				<view class="btm-item">
+					<view class="btm-item-name">
+						BTC/USDT
+					</view>
+					<view class="btm-item-val">
+						15716.53
+					</view>
+					<view class="btm-item-bl">
+						-2.44%
+					</view>
+				</view>
+				<view class="btm-item">
+					<view class="btm-item-name">
+						BTC/USDT
+					</view>
+					<view class="btm-item-val">
+						15716.53
+					</view>
+					<view class="btm-item-bl">
+						-2.44%
+					</view>
+				</view>
+				<view class="btm-item">
+					<view class="btm-item-name">
+						ETH/USDT
+					</view>
+					<view class="btm-item-val">
+						15716.53
+					</view>
+					<view class="btm-item-bl">
+						-2.44%
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 功能盒 end -->
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		computed: {
+
+		},
+		onLoad: function(option) {
+
+		},
+		onShow: function() {
+
+
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+
+		},
+		methods: {
+			// 轮播图跳转
+			bannerNavToUrl(item) {
+				// #ifdef H5
+				console.log(item.wap_url.indexOf('http'), 'banner');
+				if (item.wap_url.indexOf('http') >= 0) {
+					window.location.href = item.wap_url;
+				}
+				// #endif
+				//测试数据没有写id,用title代替
+				uni.navigateTo({
+					url: item.wap_url
+				});
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	// 顶部轮播图
+	.top-swiper {
+		margin: auto;
+		width: 726rpx;
+		height: 273rpx;
+
+		.carousel-item {
+			
+		}
+
+		// margin: 20rpx 0 0;
+		image {
+			// margin: auto;
+			width: 726rpx;
+			height: 273rpx;
+		}
+	}
+	.gnh-wrap {
+		margin: 20rpx 0;
+		width: 750rpx;
+		height: 315rpx;
+		background-color: #fff;
+		border-radius: 50rpx 50rpx 0 0;
+		.gnh-top {
+			justify-content: space-around;
+			height: 156rpx;
+			.top-item {
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				image {
+					width: 66rpx;
+					height: 75rpx;
+				}
+				view {
+					font-weight: 500;
+					color: #525C6E;
+				}
+			}
+		}
+		.gnh-btm {
+			justify-content: space-around;
+			.btm-item {
+				width: 33%;
+				text-align: center;
+				padding-top: 20rpx;
+				.btm-item-name {
+					font-size: 24rpx;
+					font-weight: 500;
+					color: #525C6E;
+				}
+				.btm-item-val {
+					font-size: 26rpx;
+					font-weight: 500;
+					color: #DD3745;
+					padding: 20rpx 0;
+				}
+				.btm-item-bl {
+					font-size: 24rpx;
+					font-weight: 500;
+					color: #DD3745;
+				}
+			}
+		}
+	}
 </style>

+ 150 - 385
pages/public/login.vue

@@ -1,386 +1,151 @@
-<template>
-	<view class="container">
-		<view class="container_text">
-			<image class="banner-img" src="/static/img/img01.png" mode="scaleToFill"></image>
-		</view>
-		<view class="loginTitle"><text>登录</text></view>
-		<view class="login_text">
-			<view class="login_input flex">
-				<view class="login_img"><image src="/static/icon/img03.png"></image></view>
-				<view class="login_name"><input class="uni-input" v-model="username" focus placeholder="请输入手机号" /></view>
-			</view>
-			<view class="login_input flex">
-				<view class="login_img"><image src="/static/icon/img04.png"></image></view>
-				<view class="login_name"><input class="uni-input" type="password" v-model="passward" focus placeholder="请输入密码" /></view>
-			</view>
-			<view><button type="green" class="uni-button uni-button-green" @click="toLogin">登录</button></view>
-			<view><button type="green" class="uni-button uni-button-green uni-button-green-plain" plain="true" hover-class="none" @click="register">注册</button></view>
-			<navigator url="./forget"><view class="forget">忘记密码</view></navigator>
-			<view class="flex other">
-				<view class="fenge"></view>
-				<view class="qita">其他方式登录</view>
-				<view class="fenge"></view>
-			</view>
-			<!-- #ifndef APP-PLUS -->
-					<view class="weixin" @click="wecahtLogin"><image src="/static/img/img05.png"></image></view>
-					<view class="weixin_text" @click="wecahtLogin">微信登录</view>
-					<!-- #endif -->
-					<!-- #ifdef APP-PLUS -->
-					<block v-if="!is_ios">
-						<view class="weixin" @click="wecahtLogin"><image src="/static/img/img05.png" mode="scaleToFill"></image></view>
-						<view class="weixin_text" @click="wecahtLogin">微信登录</view>
-					</block>
-					<block v-else>
-						<view class="ios_login flex" @click="wecahtLogin('weixin')">
-							<text class="iconfont iconweixin"></text>
-							<text class="weixin_text">微信登录</text>
-						</view>
-						<view v-if='is_apple_login' class="ios_login flex" @click="wecahtLogin('apple')">
-							<image class="loginIcon" src="/static/icon/appleIcon.png" mode=" scaleToFill"></image>
-							<text class="weixin_text">通过Apple登录</text>
-						</view>
-					</block>
-					<!-- #endif -->
-				</view>
-			</view>
-</template>
-
-<script>
-import { mapMutations } from 'vuex';
-import { login} from '@/api/login.js';
-import { getUserInfo} from '@/api/user.js';
-// #ifdef APP-PLUS
-// applelogin接口需要开发编写,基础项目中可能没有
-import { applelogin } from '@/api/set.js';
-// loginWx接口需要开发编写,基础项目中可能没有
-import { loginWx } from '@/api/login.js';
-// #endif
-// #ifdef H5
-import { loginWinxin } from '@/utils/wxAuthorized';
-// #endif
-export default {
-	data() {
-		return {
-			username: '',
-			passward: '',
-			// #ifdef APP-PLUS
-			is_ios: false ,//判断是否为ios手机
-			is_apple_login:false,//是否有ios授权登录功能
-			// #endif
-		};
-	},
-	onLoad() {
-		let obj = this;
-		// #ifdef APP-PLUS
-		let system = uni.getStorageSync('platform');
-		// 判断是否为ios
-		if (system == 'ios') {
-			obj.is_ios = true;
-		}
-		uni.getSystemInfo({
-			success(e) {
-				if(+e.system.split('.')[0]>=13){
-					obj.is_apple_login=true;
-				}
-			}
-		})
-		// #endif
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'login']),
-		// 微信登录
-		wecahtLogin(type) {
-			let obj = this;
-			// #ifdef H5
-			let weichatBrowser = uni.getStorageSync('weichatBrowser');
-			if (weichatBrowser) {
-				loginWinxin();
-			}
-			// #endif
-			// #ifdef APP-PLUS
-			uni.login({
-				provider: type,
-				success(e) {
-					uni.getUserInfo({
-						provider: type,
-						success(es) {
-							if(type==='weixin'){
-								loginWx(es.userInfo)
-									.then(e => {
-										uni.setStorageSync('token', e.data.token);
-										getUserInfo({}).then(e => {
-											obj.login();
-											// 保存返回用户数据
-											obj.setUserInfo(e.data);
-											//成功跳转首页
-											uni.switchTab({
-												url: '/pages/index/index'
-											});
-										});
-									})
-									.catch(e => {
-										console.log(e);
-										uni.showModal({
-											content: JSON.stringify(e),
-											success() {},
-											fail() {}
-										});
-									});
-							}
-							if(type==='apple'){
-								console.log(es.userInfo);
-								applelogin({
-									account: es.userInfo.openId,
-								})
-									.then(function(e) {
-										console.log(e,'token')
-										uni.setStorageSync('token', e.data.token);
-										getUserInfo({}).then(e => {
-											obj.login();
-											// 保存返回用户数据
-											obj.setUserInfo(e.data);
-											//成功跳转首页
-											uni.switchTab({
-												url: '/pages/index/index'
-											});
-										});
-										
-									})
-									.catch(function(e) {
-										console.log(e);
-									});
-							}
-							
-						},
-						fail(es) {
-							uni.showModal({
-								content: JSON.stringify(es),
-								success() {
-									// obj.login();
-									// // 保存返回用户数据
-									// obj.setUserInfo(e.data);
-									// //成功跳转首页
-									// uni.switchTab({
-									// 	url: '/pages/index/index'
-									// });
-								}
-							});
-						}
-					});
-				},
-				fail(e) {
-					uni.showModal({
-						title: '提示',
-						content: JSON.stringify(e),
-						showCancel: false
-					});
-				}
-			});
-			// #endif
-		},
-		//登录
-		async toLogin() {
-			let obj = this;
-			obj.logining = true;
-			if (obj.username == '') {
-				obj.$api.msg('请输入手机号');
-				return;
-			}
-			if (obj.passward == '') {
-				obj.$api.msg('请输入密码');
-				return;
-			}
-			login({
-				account: obj.username,
-				password: obj.passward
-			})
-				.then(function(e) {
-					uni.setStorageSync('token', e.data.token);
-					obj.$store.commit('hasLogin', true);
-					getUserInfo({}).then(e => {
-						obj.login();
-						// 保存返回用户数据
-						obj.setUserInfo(e.data);
-						let ur = uni.getStorageSync('present')|| '/pages/index/index';
-						//成功跳转首页
-						uni.switchTab({
-							url: ur,
-							fail(e) {
-								uni.navigateTo({
-									url: ur,
-									fail(e) {
-										uni.navigateTo({
-											url: '/pages/index/index',
-										});
-									}
-								});
-							}
-						});
-					});
-				})
-				.catch(function(e) {
-					console.log(e);
-				});
-		},
-		//跳转注册页
-		register() {
-			uni.navigateTo({
-				url: `/pages/public/register`
-			});
-		},
-		// 后退
-		navBack() {
-			uni.navigateBack();
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-	/* #ifdef APP-PLUS */
-	
-	.ios_login {
-		width: 260rpx;
-		border-radius: 12rpx;
-		justify-content: center;
-		border: 1px solid #212121;
-		margin: 24rpx auto;
-		padding: 10rpx;
-		background-color: #212121;
-		color: #ffffff;
-		.loginIcon {
-			width: 50rpx;
-			height: 50rpx;
-		}
-		.weixin_text {
-			line-height: 1;
-			margin-left: 20rpx;
-			color: #ffffff !important;
-		}
-	}
-	
-	/* #endif */
-	.ios_login {
-		width: 350rpx;
-		border-radius: 12rpx;
-		justify-content: center;
-		border: 1px solid #212121;
-		margin: 24rpx auto;
-		padding: 15rpx;
-		background-color: #212121;
-		color: #ffffff;
-		font-size: 32rpx;
-		.loginIcon {
-			font-size: 35rpx;
-			width: 35rpx;
-			height: 35rpx;
-		}
-		.weixin_text {
-			line-height: 1;
-			margin-left: 20rpx;
-			color: #ffffff !important;
-		}
-	}
-	
-page {
-	height: 100%;
-}
-.container {
-	width: 100%;
-	height: 100%;
-	background-size: 100%;
-}
-.container_text {
-	width: 100%;
-	height: 500rpx;
-	top: 0rpx;
-	.banner-img {
-		width: 100%;
-		height: 100%;
-	}
-}
-.login_text {
-	margin: auto 30rpx;
-	position: relative;
-	padding: 100rpx 102rpx;
-	background-color: #ffffff;
-	margin-top: -180rpx;
-	border-radius: 20rpx;
-	.login_input {
-		border-bottom: 1px solid #f0f0f0;
-		margin-bottom: 65rpx;
-		.login_img image {
-			height: 35rpx;
-			width: 29rpx;
-			margin-right: 20rpx;
-		}
-		.uni-input {
-			text-align: left;
-			width: 470rpx;
-			font-size: 28rpx !important;
-		}
-		.login_name {
-			color: #333333;
-		}
-	}
-
-	.other {
-		margin-top: 60rpx;
-		.fenge {
-			width: 30%;
-			height: 2rpx;
-			background-color: #eeeeee;
-		}
-		.qita {
-			font-size: 28rpx;
-			color: #999999;
-		}
-	}
-	.weixin {
-		width: 75rpx;
-		height: 75rpx;
-		margin: 25rpx auto;
-	}
-	.weixin image {
-		width: 100%;
-		height: 100%;
-	}
-	.weixin_text {
-		text-align: center;
-		font-size: 28rpx;
-		color: #999999;
-	}
-	.forget {
-		font-size: 28rpx;
-		width: 100%;
-		text-align: right;
-		color: #999999;
-	}
-
-	.uni-button-green {
-		color: #ffffff;
-		background-color: #5dbc7c;
-		margin: 40rpx 10rpx;
-		border-radius: 50rpx;
-	}
-	.uni-button-green-plain {
-		border: 1px solid #5dbc7c;
-		margin: 40rpx 10rpx;
-		border-radius: 50rpx;
-		color: #5dbc7c;
-		background-color: #ffffff;
-	}
-	.uni-button {
-		height: 85rpx;
-		line-height: 85rpx;
-	}
-}
-.loginTitle {
-	position: absolute;
-	top: 250rpx;
-	width: 100%;
-	text-align: center;
-	color: white;
-	font-size: 40rpx;
-}
+<template>
+	<view class="container">
+		<view class="wjmm" style="text-align: right;padding-right: 30rpx;font-size: 36rpx;" @click="zc()">
+			注冊
+		</view>
+		<view class="tit" style="padding-top:120rpx;">
+			郵箱
+		</view>
+		<input type="text" class="shuru" placeholder="請翰入郵箱" v-model="email">
+		<view class="tit">
+			密碼
+		</view>
+		<input type="password" class="shuru" placeholder="請翰入密碼" v-model="lpwd" >
+		<view class="" style="padding:20rpx 48rpx;">
+			<view class="wjmm" @click="wjmm()">
+				忘記密碼?
+			</view>
+		</view>
+		<view class="flex" style="justify-content: flex-end;padding: 0 48rpx;">
+			<view class="gologin" @click="gologin">
+				登錄
+			</view>
+		</view>
+		
+		<!-- <view class="login_text">
+			<view class="login_input flex">
+				<view class="login_img">
+					<image src="/static/icon/img03.png"></image>
+				</view>
+				<view class="login_name"><input class="uni-input" v-model="username" focus placeholder="请输入手机号" />
+				</view>
+			</view>
+			<view class="login_input flex">
+				<view class="login_img">
+					<image src="/static/icon/img04.png"></image>
+				</view>
+				<view class="login_name"><input class="uni-input" type="password" v-model="passward" focus
+						placeholder="请输入密码" /></view>
+			</view>
+			<view><button type="green" class="uni-button uni-button-green" @click="toLogin">登录</button></view>
+			<view><button type="green" class="uni-button uni-button-green uni-button-green-plain" plain="true"
+					hover-class="none" @click="register">注册</button></view>
+			<navigator url="./forget">
+				<view class="forget">忘记密码</view>
+			</navigator>
+			<view class="flex other">
+				<view class="fenge"></view>
+				<view class="qita">其他方式登录</view>
+				<view class="fenge"></view>
+			</view>
+		</view> -->
+	</view>
+</template>
+
+<script>
+	import {
+		loginWx,
+		gologin
+	} from '@/api/login.js';
+	export default {
+		data() {
+			return {
+				email: '',
+				lpwd: ''
+			};
+		},
+		onLoad() {
+			
+		},
+		methods: {
+			zc() {
+				uni.navigateTo({
+					url: '/pages/public/register',
+				})
+			},
+			wjmm() {
+				uni.navigateTo({
+					url: '/pages/public/forget',
+				})
+			},
+			gologin() {
+				let obj = this
+				if(obj.loadingType == 'loading') {
+					return
+				}
+				if(!obj.isEmailAvailable(obj.email)) {
+					return obj.$api.msg('請輸入正確的郵箱!')
+				}
+				obj.loadingType = 'loading'
+				gologin({
+					email: obj.email,
+					lpwd: obj.lpwd
+				}).then(res => {
+					console.log(res)
+					obj.loadingType = 'no'
+				}).catch(err => {
+					console.log(res)
+					obj.loadingType = 'no'
+				})
+			},
+			
+			isEmailAvailable(obj) {
+				let email = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
+				if (!email.test(obj)) {
+					return false;
+				}
+			 return true;
+			},
+
+		}
+	};
+</script>
+
+<style lang="scss">
+
+	page {
+		height: 100%;
+		background-color: #fff;
+		font-size: 32rpx;
+	}
+
+	.container {
+		width: 100%;
+		height: 100%;
+		background-size: 100%;
+	}
+
+	.shuru {
+		display: block;
+		background-color: #f5f5f5;
+		width: 673rpx;
+		height: 95rpx;
+		margin: auto;
+		padding-left: 30rpx;
+		text-align: 95rpx;
+	}
+	.tit {
+		padding:60rpx 48rpx 20rpx;
+	}
+	.gologin {
+		width: 204rpx;
+		height: 98rpx;
+		line-height: 98rpx;
+		background-color: #fcd535;
+		text-align: center;
+		border-radius: 20rpx;
+	}
+	.wjmm {
+		color: #fcd535;
+	}
 </style>

+ 82 - 132
pages/public/register.vue

@@ -1,10 +1,33 @@
 <template>
 	<view class="container">
-		<view class="container_text" >
-			<image class="banner-img" src="/static/img/img01.png" mode="scaleToFill"></image>
-		</view>
-		<view class="loginTitle"><text>注册</text></view>
-		<view class="login_text">
+		<view class="wjmm" style="text-align: right;padding-right: 30rpx;font-size: 36rpx;" @click="dl()">
+			登錄
+		</view>
+		<view class="tit" style="padding-top:120rpx;">
+			郵箱
+		</view>
+		<input type="text" class="shuru" placeholder="請翰入郵箱" v-model="email">
+		<view class="tit" >
+			獲取郵箱驗證碼
+		</view>
+		<view class="flex" style="width: 673rpx;justify-content: space-between;margin: auto;border:1px solid red;">
+			<input type="password" class=" yzm" placeholder="請翰入密碼" v-model="email">
+			<view class="code yzmbtn" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
+		</view>
+		
+		<view class="tit" >
+			密碼
+		</view>
+		<input type="password" class="shuru" placeholder="請翰入密碼" v-model="email">
+		<view class="tit">
+			確認密碼
+		</view>
+		<input type="password" class="shuru" placeholder="請翰入密碼" v-model="email">
+		<view class="tit" >
+			邀請碼
+		</view>
+		<input type="text" class="shuru" placeholder="請翰入邀請碼" v-model="email">
+		<!-- <view class="login_text">
 			<view class="login_input flex">
 				<view class="login_img"><image src="/static/icon/img03.png"></image></view>
 				<view class="login_name"><input class="uni-input" v-model="phone" focus placeholder="请输入手机号" /></view>
@@ -21,16 +44,16 @@
 				<view class="login_img"><image src="/static/icon/img07.png"></image></view>
 				<view class="login_name"><input class="uni-input" type="text" v-model="invitation" focus placeholder="请输入邀请码" /></view>
 			</view>
-			<!-- <view class="login_input flex">
+			<view class="login_input flex">
 				<view class="login_img"><image src="/static/icon/img06.png"></image></view>
 				<view class="login_name flex">
 					<input class="uni-input width" v-model="code" focus placeholder="请输入验证码" />
 					<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
 				</view>
-			</view> -->
+			</view>
 			<view><button type="green" @click="register" class="uni-button uni-button-green">注册账号</button></view>
 			<view><button class="uni-button uni-button-green uni-button-green-plain" type="green" plain="true" hover-class="none" @click="login">返回登录</button></view>
-		</view>
+		</view> -->
 	</view>
 </template>
 <script>
@@ -59,7 +82,12 @@ export default {
 			}
 		}
 	},
-	methods: {
+	methods: {
+		dl() {
+			uni.navigateTo({
+				url: '/pages/public/login'
+			})
+		},
 		// 注册
 		register() {
 			let obj = this;
@@ -152,130 +180,52 @@ export default {
 </script>
 
 <style lang="scss">
-page {
-	height: 100%;
-}
-.container {
-	width: 100%;
-	height: 100%;
-	background-size: 100%;
-}
-.container_text {
-	width: 100%;
-	height: 500rpx;
-	top: 0rpx;
-	.banner-img {
-		width: 100%;
-		height: 100%;
-	}
-}
-.login_text {
-	margin: auto 30rpx;
-	position: relative;
-	padding: 100rpx 102rpx;
-	background-color: #ffffff;
-	margin-top: -180rpx;
-	border-radius: 20rpx;
-	.login_input {
-		border-bottom: 1px solid #f0f0f0;
-		margin-bottom: 65rpx;
-		.login_img image {
-			height: 35rpx;
-			width: 29rpx;
-			margin-right: 20rpx;
-		}
-		.uni-input {
-			text-align: left;
-			width: 470rpx;
-			font-size: 28rpx !important;
-		}
-		.login_name {
-			color: #333333;
-		}
-	}
-
-	.other {
-		margin-top: 60rpx;
-		.fenge {
-			width: 30%;
-			height: 2rpx;
-			background-color: #eeeeee;
-		}
-		.qita {
-			font-size: 28rpx;
-			color: #999999;
-		}
-	}
-	.weixin {
-		width: 75rpx;
-		height: 75rpx;
-		margin: 25rpx auto;
-	}
-	.weixin image {
-		width: 100%;
-		height: 100%;
-	}
-	.weixin_text {
-		text-align: center;
-		font-size: 28rpx;
-		color: #999999;
-	}
-	.forget {
-		font-size: 28rpx;
-		width: 100%;
-		text-align: right;
-		color: #999999;
+page {
+		height: 100%;
+		background-color: #fff;
+		font-size: 32rpx;
+	}
+
+	.container {
+		width: 100%;
+		height: 100%;
+		background-size: 100%;
+	}
+
+	.shuru {
+		display: block;
+		background-color: #f5f5f5;
+		width: 673rpx;
+		height: 95rpx;
+		margin: auto;
+		padding-left: 30rpx;
+		text-align: 95rpx;
+	}
+	.tit {
+		padding:40rpx 48rpx 20rpx;
+	}
+	.gologin {
+		width: 204rpx;
+		height: 98rpx;
+		line-height: 98rpx;
+		background-color: #fcd535;
+		text-align: center;
+		border-radius: 20rpx;
+	}
+	.wjmm {
+		color: #fcd535;
 	}
-
-	.uni-button-green {
-		color: #ffffff;
-		background-color: #5dbc7c;
-		margin: 40rpx 10rpx;
-		border-radius: 50rpx;
-	}
-	.uni-button-green-plain {
-		border: 1px solid #5dbc7c;
-		margin: 40rpx 10rpx;
-		border-radius: 50rpx;
-		color: #5dbc7c;
-		background-color: #ffffff;
-	}
-	.uni-button {
-		height: 85rpx;
-		line-height: 85rpx;
+	.yzm {
+		width: 400rpx;
+		height: 95rpx;
+	}
+	.yzmbtn {
+		width: 234rpx;
+		height: 95rpx;
+		background-color: #f5f5f5;
+		text-align: center;
+		line-height: 95rpx;
+		color: #fcd535;
 	}
-}
-.loginTitle {
-	position: absolute;
-	top: 250rpx;
-	width: 100%;
-	text-align: center;
-	color: white;
-	font-size: 40rpx;
-}
-
-.forget {
-	width: 100rpx;
-	font-size: 24rpx;
-	color: #ffffff;
-	margin: 0px auto;
-	border-bottom: 1px solid #ffffff;
-}
-.width {
-	width: 325rpx !important;
-}
-.code {
-	color: #5dbc7c;
-	font-size: 23rpx;
-	border-left: 1px solid #eeeeee;
-	width: 150rpx;
-	flex-shrink: 0;
-	text-align: center;
-}
-uni-button {
-	height: 80rpx !important;
-	line-height: 80rpx !important;
-}
-
 </style>
 

BIN
static/icon/gn-1.png


BIN
static/icon/gn-2.png


BIN
static/icon/gn-3.png


BIN
static/icon/gn-4.png


BIN
static/icon/gn-5.png


BIN
static/img/banner.png


+ 1 - 1
store/index.js

@@ -6,7 +6,7 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 	state: {
 		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
-		baseURL:'https://sc.manyuanchunjia.com',//请求地址配置 
+		baseURL:'http://heyu.frp.liuniu946.com',//请求地址配置 
 		urlFile:'/index',//项目部署所在文件夹
 		userInfo: {}, //登录信息
 		loginInterceptor:false,//是否打开强制登录

+ 4 - 4
utils/request.js

@@ -10,9 +10,9 @@ service.interceptors.response(
 		try {
 			let res = response.data;
 			// 解析字符串为数字
-			if (res.status !== 200) {
+			if (res.code !== 1) {
 				console.log(res.status);
-				if (res.status == 410000) {
+				if (res.code == 3) {
 					// 调用退出登录方法清空用户信息
 					store.commit('user/logout');
 					// 判断是否开启强制登录
@@ -30,9 +30,9 @@ service.interceptors.response(
 						}
 					})
 				} else {
-					if (res.msg != '系统出现异常') {
+					if (res.info != '系统出现异常') {
 						uni.showToast({
-							title: res.msg,
+							title: res.info,
 							duration: 1500,
 							mask: false,
 							icon: 'none',