Merge branch 'master' of http://git.qiniu1314.com/zhang/jingcai

libs/i18n/lang/en.json

@@ -204,7 +204,7 @@
 		"a2": "Mutual entertainment area",
 		"a3": "Pressure sum value (01234) above, (56789) below, (13579) odd, (02468) even, 180U in 100U pressure",
 		"a4": "Share area",
-		"a5": "Above the pressure sum value (01234), below (56789), (13579) odd, (02468) even, under the pressure of 100U, 100.2U is returned, and the principal is not returned. The share area lasts for 1 hour per day, from 19:00 to 21:00 every night, for a total of 24 sessions."
+		"a5": "Above the pressure sum value (01234), below (56789), (13579) odd, (02468) even, under the pressure of 100U, 100.2U is returned, and the principal is not returned. The share area lasts for 2 hour per day, from 19:00 to 21:00 every night, for a total of 24 sessions."
 	},
 	"promotion": {
 		"a1": "Campaign",

pages/public/forget.vue

@@ -20,7 +20,7 @@
 			<view class="login_input flex">
 				<view class="login_img"><image class="codeimg" src="/static/icon/ze2.png"></image></view>
 				<view class="login_name flex">
-					<input class="uni-input width" v-model="captcha" type="number" focus :placeholder="$t('password.a6')" />
+					<input class="uni-input" v-model="captcha" type="number" focus :placeholder="$t('password.a6')" />
 					<view class="code" @click="verification">{{ countDown == 0 ? $t('login.b5') : countDown }}</view>
 				</view>
 			</view>
@@ -209,18 +209,6 @@ page {
 		}
 	}
 
-	.other {
-		margin-top: 60rpx;
-		.fenge {
-			width: 30%;
-			height: 2rpx;
-			background-color: #eeeeee;
-		}
-		.qita {
-			font-size: 28rpx;
-			color: #999999;
-		}
-	}
 	.uni-button-green {
 		text-align: center;
 		color: #ffffff;