Browse Source

2024-4-20

cmy 10 months ago
parent
commit
ac721373d2

+ 10 - 4
pages.json

@@ -40,16 +40,22 @@
 			"path": "pages/public/register",
 			"style": {
 				"navigationBarTitleText": "注册",
-				"navigationBarBackgroundColor": "#000000",
-				"navigationBarTextStyle": "white"
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
 			}
 		},
 		{
 			"path": "pages/public/login",
 			"style": {
 				"navigationBarTitleText": "登录",
-				"navigationBarBackgroundColor": "#000000",
-				"navigationBarTextStyle": "white"
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
 			}
 		},
 		{

+ 9 - 5
pages/public/login.vue

@@ -9,7 +9,7 @@
 					<image src="/static/icon/ze.png"></image>
 				</view>
 				<view class="login_name">
-					<input class="uni-input" v-model="account" focus :placeholder="$t('login.a1')" />
+					<input class="uni-input" v-model="account" focus placeholder="请输入手机号" />
 				</view>
 			</view>
 			<view class="login_input flex">
@@ -17,7 +17,7 @@
 					<image src="/static/icon/ze2.png"></image>
 				</view>
 				<view class="login_name"><input class="uni-input" type="password" v-model="passward" focus
-						:placeholder="$t('login.a3')" /></view>
+						placeholder="请输入密码" /></view>
 			</view>
 			<view>
 				<button type="green" class="uni-button uni-button-green" @click="toLogin">{{$t('login.a4')}}</button>
@@ -283,10 +283,9 @@
 	.container {
 		width: 100%;
 		height: 100%;
-		background-size: 100%;
+		background-size: 100% 100%;
 		background-image: url("../../static/img/loginBg.png");
 		background-repeat: no-repeat;
-		background-position: 100% 100%;
 	}
 	
 	/* #ifdef APP-PLUS */
@@ -375,6 +374,11 @@
 				text-align: left;
 				width: 100%;
 				font-size: 28rpx !important;
+				color: #FFF;
+				
+			}
+			.input-placeholder{
+				color: #FFF;
 			}
 
 			.login_name {
@@ -420,7 +424,7 @@
 			font-size: 28rpx;
 			width: 100%;
 			text-align: right;
-			color: #999999;
+			color: #FFF;
 		}
 
 		.uni-button-green {

+ 39 - 30
pages/public/register.vue

@@ -4,12 +4,19 @@
 			<image class="banner-img" src="/static/img/logo.png" mode="widthFix"></image>
 		</view>
 		<view class="login_text">
+			<view class="login_input flex">
+				<view class="login_img">
+					<image src="/static/icon/ze4.png"></image>
+				</view>
+				<view class="login_name"><input class="uni-input"  v-model="store_name" focus
+						placeholder="请输入商户名称" /></view>
+			</view>
 			<view class="login_input flex">
 				<view class="login_img">
 					<image src="/static/icon/ze.png"></image>
 				</view>
 				<view class="login_name"><input class="uni-input" @input="checkAccount" v-model="account" focus
-						:placeholder="$t('login.a1')" /></view>
+						placeholder="请输入手机号" /></view>
 			</view>
 			<view class="login_input flex">
 				<view class="login_img">
@@ -34,7 +41,7 @@
 			</view>
 			<view class="login_input flex">
 				<view class="login_img">
-					<image src="/static/icon/ze.png"></image>
+					<image src="/static/icon/ze3.png"></image>
 				</view>
 				<view class="login_name flex">
 					<input class="uni-input width" v-model="captcha" focus :placeholder="$t('login.b6')" />
@@ -45,12 +52,6 @@
 			</view>
 			<view><button class="uni-button uni-button-green uni-button-green-plain" type="green" plain="true"
 					hover-class="none" @click="login">{{$t('login.a4')}}</button></view>
-			<!-- #ifdef H5 -->
-			<view class="flex">
-				<button class="uni-button loadapp" @click="domApp('apk')">APK下载</button>
-				<button class="uni-button loadapp" @click="domApp('ios')">IOS下载</button>
-			</view>
-			<!-- #endif -->
 		</view>
 	</view>
 </template>
@@ -78,6 +79,7 @@
 				countDown: 0, //倒计时
 				trade_password: '', // 交易密码
 				isPhone: true, //是否为手机号,默认为true
+				store_name:''
 			};
 		},
 		onLoad(option) {
@@ -161,6 +163,9 @@
 						return;
 					}
 				}
+				if(!this.store_name){
+					this.$api.msg("请输入商户名称");
+				}
 				if (obj.password == '') {
 					obj.$api.msg(obj.$t("reg.a9"));
 					return;
@@ -175,13 +180,14 @@
 					captcha: obj.captcha, //验证码
 					password: obj.password, //密码
 					trade_password: obj.trade_password, // 交易密码
-					spread: this.spread //上级推广人
+					spread: obj.spread ,//上级推广人
+					store_name:obj.store_name
 				}).then(function(e) {
-					uni.showToast({
-						title: obj.$t("reg.c5"),
-						duration: 2000,
-						position: 'top'
-					});
+					// uni.showToast({
+					// 	title: obj.$t("reg.c5"),
+					// 	duration: 2000,
+					// 	position: 'top'
+					// });
 					uni.showModal({
 						title: obj.$t("enter.a7"),
 						content: obj.$t("login.c3"),
@@ -250,8 +256,9 @@
 	.container {
 		width: 100%;
 		height: 100%;
-		background-size: 100%;
-		background-color: #000000;
+		background-size: 100% 100%;
+		background-image: url("../../static/img/loginBg.png");
+		background-repeat: no-repeat;
 	}
 
 	.container_text {
@@ -266,8 +273,7 @@
 	.login_text {
 		margin: auto 10rpx;
 		position: relative;
-		padding: 100rpx 102rpx;
-		background-color: #000000;
+		padding: 100rpx 72rpx;
 		border-radius: 20rpx;
 
 		.login_input {
@@ -285,7 +291,10 @@
 				width: 100%;
 				font-size: 28rpx !important;
 			}
-
+			.input-placeholder{
+				color: #FFF;
+			}
+			
 			.login_name {
 				color: #FFFFFF;
 				flex-grow: 1;
@@ -341,18 +350,18 @@
 		/* #endif */
 
 		.uni-button-green {
-			color: #ffffff;
-			background-color: #feb041;
-			margin: 40rpx 10rpx;
-			border-radius: 50rpx;
+			color: #1257FE;
+			background-color: #FFF;
+			margin: 40rpx 0rpx;
+			border-radius: 10rpx;
 		}
-
+		
 		.uni-button-green-plain {
-			border: 1px solid #feb041;
-			margin: 40rpx 10rpx;
-			border-radius: 50rpx;
-			color: #feb041;
-			background-color: #000000;
+			border: 1px solid #FFF;
+			margin: 40rpx 0rpx;
+			border-radius: 10rpx;
+			color: #FFF;
+			background-color: transparent;
 		}
 
 		.uni-button {
@@ -383,7 +392,7 @@
 	}
 
 	.code {
-		color: #feb041;
+		color: #FFF;
 		font-size: 23rpx;
 		border-left: 1px solid #eeeeee;
 		width: 150rpx;

BIN
static/icon/ze3.png


BIN
static/icon/ze4.png


BIN
static/icon/注册_slices/icon-code.png


BIN
static/icon/注册_slices/icon-code@2x.png


BIN
static/icon/注册_slices/icon-phone.png


BIN
static/icon/注册_slices/icon-phone@2x.png


BIN
static/icon/注册_slices/icon-yzm@2x.png


BIN
static/icon/注册_slices/ze3.png


BIN
static/icon/注册_slices/ze4.png


BIN
static/icon/注册_slices/图层 529@2x.png


BIN
static/icon/注册_slices/图层 530.png


BIN
static/icon/注册_slices/图层 530@2x.png


+ 5 - 5
store/index.js

@@ -18,16 +18,16 @@ const store = new Vuex.Store({
 				value: 'en',
 				label: 'English'
 			},
-			// {
-			//      value: 'cn',
-			//      label: '简体中文'
-			//    },
+			{
+			     value: 'cn',
+			     label: '简体中文'
+			   },
 			{
 				value: 'tw',
 				label: '繁體中文'
 			}
 		],
-		lang:uni.getStorageSync('lang')||'tw',
+		lang:uni.getStorageSync('lang')||'cn',
 
 	},
 	mutations: {