revert: 所有代码与custom/common分支同

pages_tool/login/find.vue

@@ -23,13 +23,25 @@
 			<!-- 输入手机号和验证码 -->
 			<block v-if="stepShow == 0">
 				<view class="form-input">
-					<input class="uni-input" placeholder-class="placeholder-class" type="text" maxlength="17"
-						v-model="formData.mobile" :placeholder="$lang('accountPlaceholder')" />
+					<input
+						class="uni-input"
+						placeholder-class="placeholder-class"
+						type="text"
+						maxlength="17"
+						v-model="formData.mobile"
+						:placeholder="$lang('accountPlaceholder')"
+					/>
 				</view>
 
 				<view class="form-input align-type">
-					<input class="uni-input info-content" placeholder-class="placeholder-class" type="number"
-						maxlength="4" :placeholder="$lang('captchaPlaceholder')" v-model="formData.captcha" />
+					<input
+						class="uni-input info-content"
+						placeholder-class="placeholder-class"
+						type="number"
+						maxlength="4"
+						:placeholder="$lang('captchaPlaceholder')"
+						v-model="formData.captcha"
+					/>
 					<image :src="captcha.img" class="captcha" @click="getCaptcha"></image>
 				</view>
 
@@ -44,13 +56,27 @@
 			<!-- 输入新密码 -->
 			<block v-if="stepShow == 2">
 				<view class="form-input">
-					<input class="uni-input" placeholder-class="placeholder-class" type="text" maxlength="30"
-						password="true" :placeholder="$lang('passwordPlaceholder')" v-model="formData.password" />
+					<input
+						class="uni-input"
+						placeholder-class="placeholder-class"
+						type="text"
+						maxlength="30"
+						password="true"
+						:placeholder="$lang('passwordPlaceholder')"
+						v-model="formData.password"
+					/>
 				</view>
 
 				<view class="form-input">
-					<input class="uni-input" placeholder-class="placeholder-class" type="text" maxlength="30"
-						password="true" :placeholder="$lang('rePasswordPlaceholder')" v-model="formData.rePassword" />
+					<input
+						class="uni-input"
+						placeholder-class="placeholder-class"
+						type="text"
+						maxlength="30"
+						password="true"
+						:placeholder="$lang('rePasswordPlaceholder')"
+						v-model="formData.rePassword"
+					/>
 				</view>
 
 				<button type="primary" class="find-btn" @click="save">{{ $lang('save') }}</button>
@@ -61,9 +87,10 @@
 
 <script>
 import validate from 'common/js/validate.js';
+import mypOne from '@/pages_tool/components/myp-one/myp-one.vue';
 export default {
 	components: {
-		mypOne: () => import('@/components/myp-one/myp-one.vue'),
+		mypOne
 	},
 	data() {
 		return {
@@ -111,17 +138,17 @@ export default {
 		// 下一步
 		async nextStep() {
 			let step0Rule = [
-				{
-					name: 'mobile',
-					checkType: 'phoneno',
-					errorMsg: '请输入正确的手机号'
-				},
-				{
-					name: 'captcha',
-					checkType: 'required',
-					errorMsg: this.$lang('captchaPlaceholder')
-				}
-			], //手机验证
+					{
+						name: 'mobile',
+						checkType: 'phoneno',
+						errorMsg: '请输入正确的手机号'
+					},
+					{
+						name: 'captcha',
+						checkType: 'required',
+						errorMsg: this.$lang('captchaPlaceholder')
+					}
+				], //手机验证
 				step0CheckRes;
 
 			step0CheckRes = validate.check(this.formData, step0Rule);

pages_tool/login/login.vue

@@ -1,8 +1,7 @@
 <template>
 	<view :style="themeColor">
 		<scroll-view scroll-y="false" class="container">
-			<view class="header-wrap"
-				:style="{ backgroundImage: 'url(' + $util.img('public/uniapp/member/head.png') + ')' }">
+			<view class="header-wrap" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/member/head.png') + ')' }">
 				<view class="t-b">
 					<div v-html="$lang('welcomeText')"></div>
 				</view>
@@ -67,12 +66,9 @@
 
 <script>
 import validate from 'common/js/validate.js';
+import registerReward from '@/components/register-reward/register-reward.vue';
 
 export default {
-	components: {
-		loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
-		registerReward: () => import('@/components/register-reward/register-reward.vue'),
-	},
 	data() {
 		return {
 			isAgree: false,