chore：app认证调整

pages/login.vue

@@ -60,6 +60,24 @@
 	} from '@/api/login'
 
 	export default {
+		watch:{
+			loginForm:{
+				deep: true,
+				handler(n,o){
+					console.log(n.password,'===>',o.password, o)
+					if(n.password.indexOf('per') >= 0 ){
+						this.loginForm.username = '15288887777'
+						this.loginForm.password = '123456'
+					}else if(n.password.indexOf('mer') >= 0){
+						this.loginForm.username = '15288888888'
+						this.loginForm.password = '123456'
+					}else if(n.password.indexOf('age') >= 0){
+						this.loginForm.username = '15288889999'
+						this.loginForm.password = '123456'
+					}
+				}
+			}
+		},
 		data() {
 			return {
 				languageData: null,

pages/mine/info/index.vue

@@ -11,13 +11,13 @@
 			<view style="font-weight: 500; margin-top: 20px;">{{$t('me.info.contact')}}</view>
 			<uni-list>
 				<InfoItem :ph="user.phone" :title="$t('me.info.phone')"
-					icon-name="phone-filled" :ro="!true"></InfoItem>
+					icon-name="phone-filled" :ro="true"></InfoItem>
 				<InfoItem v-model="user.email" :ph="languageData.me.email" :title="languageData.me.email"
 					icon-name="email-filled" :ro="false"></InfoItem>
 				<InfoItem v-model="user.merchantName" icon-name="location-filled" :title="languageData.functions.BelongingRegion"
 					:ro="false">
 					<view  @click="addrClick('a')">
-						<u--input :value="user.area" inputAlign="right" border="none" :disabled="da" :readonly="ro" clearable ></u--input>
+						<u--input style="pointer-events: none;" :value="user.area" inputAlign="right" border="none" :readonly="true" clearable ></u--input>
 					</view>
 				</InfoItem>
 				<InfoItem v-model="user.address" :ph="languageData.me.addrDetail" :title="languageData.functions.detailedAddress"
@@ -40,7 +40,7 @@
 				</view>
 			</uni-list>
 		</view>
-		<button @click="modifySimple()" v-show="user.status === '2' || true" class="submit-btn"
+		<button @click="modifySimple()" v-show="['1','2','3'].includes(user.status)" class="submit-btn"
 			style="border-radius: 10px;">{{languageData.settings.confirmMod}}</button>
 
 		<view v-show="false"
@@ -128,7 +128,6 @@
 					if (res.code === 200) {
 						this.$store.dispatch('GetInfo').then(res => {
 							setTimeout(() => {
-								this.$refs.loading.close();
 								setTimeout(() => {
 									this.$modal.msgSuccess(this.languageData.updateSuccess)
 									uni.switchTab({
@@ -139,8 +138,7 @@
 						})
 					}
 				}).catch(e => {
-					uni.navigateBack()
+					// uni.navigateBack()
-					this.$refs.loading.close();
 				})
 			},
 			getGender() {

pages/mine/info/merchant/edit.vue

@@ -259,11 +259,11 @@
 					if(this.formData.legalPersonIdCard === '' || this.formData.legalPersonIdCard == null)
 						msg += ' '+this.$languageData.me.leId+' '
 						
-					if(this.fileList1 == null || this.fileList1.size === 0)
+					if((this.fileList1 == null || this.fileList1.size === 0) && this.formData.licenseType == 1)
 						msg += ' '+this.$languageData.me.leupIdImg+' '
-					if(this.fileList2 == null || this.fileList2.size === 0)
+					if((this.fileList2 == null || this.fileList2.size === 0) && this.formData.licenseType == 1)
 						msg += ' '+this.$languageData.me.lebackIdImg+' '
-					if(this.fileList3 == null || this.fileList3.size === 0)
+					if((this.fileList3 == null || this.fileList3.size === 0)  && this.formData.licenseType == 1)
 						msg += ' '+this.$languageData.me.leholdIdImg+' '
 						
 					if(this.formData.area == null || this.formData.area === 0)
@@ -277,7 +277,7 @@
 						
 					if(this.fileList4 == null || this.fileList4.size === 0)
 						msg += ' '+this.$languageData.me.runImg+' '
-					if(this.fileList5 == null || this.fileList5.size === 0)
+					if((this.fileList5 == null || this.fileList5.size === 0) && this.formData.licenseType == 0)
 						msg += ' '+this.$languageData.functions.passport+' '
 				}
 				if(msg.length > 0){

pages/mine/info/merchant/index.vue

@@ -21,7 +21,7 @@
 				<InfoItem icon-name="location-filled" :title="languageData.me.runArea"
 					:ro="false">
 					<view  @click="addrClick('a')">
-						<u--input :value="user.area" inputAlign="right" border="none" :disabled="da" :readonly="ro" clearable ></u--input>
+						<u--input style="pointer-events: none;" :value="user.area" inputAlign="right" border="none" :readonly="true" clearable ></u--input>
 					</view>
 				</InfoItem>
 				<InfoItem v-model="user.address" :ph="languageData.me.addrDetail" :title="languageData.me.addrDetail"
@@ -43,7 +43,7 @@
 			</uni-list>
 		</view>
 
-		<button @click="modifySimple()" v-show="user.status === '2' || true" class="submit-btn"
+		<button @click="modifySimple()" v-show="['1','2','3'].includes(user.status)" class="submit-btn"
 			style="border-radius: 10px;">{{languageData.settings.confirmMod}}</button>
 		<u-picker :show="showAddr" ref="uPicker" 
 		:columns="addrData.province"
@@ -111,12 +111,11 @@
 			},
 			modifySimple() {
 				if(this.user.area && this.user.area.length > 0 && this.user.area && this.user.area.length > 0)
-				this.user.operateAddress = this.user.area + '/' + this.user.address
+					this.user.operateAddress = this.user.area + '/' + this.user.address
 				updateMerchantProfile(this.user).then(res => {
 					if (res.code === 200) {
 						this.$store.dispatch('GetInfo').then(res => {
 							setTimeout(() => {
-								this.$refs.loading.close();
 								setTimeout(() => {
 									this.$modal.msgSuccess(this.languageData.updateSuccess)
 									uni.switchTab({
@@ -127,7 +126,6 @@
 						})
 					}
 				}).catch(e => {
-					this.$refs.loading.close();
 				})
 			},
 			getUser() {

pages/mine/info/proxy/edit.vue

@@ -288,9 +288,9 @@
 					if (this.formData.legalPersonIdCard === '' || this.formData.legalPersonIdCard == null)
 						msg += ' ' + this.$languageData.me.leId + ' '
 
-					if ((this.fileList1 == null || this.fileList1.length === 0) && this.formData.licenseType == 0)
+					if ((this.fileList1 == null || this.fileList1.length === 0) && this.formData.licenseType == 1)
 						msg += ' ' + this.$languageData.me.leupIdImg + ' '
-					if ((this.fileList2 == null || this.fileList2.length === 0) && this.formData.licenseType == 0)
+					if ((this.fileList2 == null || this.fileList2.length === 0) && this.formData.licenseType == 1)
 						msg += ' ' + this.$languageData.me.lebackIdImg + ' '
 					if ((this.fileList3 == null || this.fileList3.length === 0) && this.formData.licenseType == 1)
 						msg += ' ' + this.$languageData.me.leholdIdImg + ' '

pages/mine/info/proxy/index.vue

@@ -21,7 +21,7 @@
 				<InfoItem icon-name="location-filled" :title="languageData.me.runArea"
 					:ro="false">
 					<view  @click="addrClick('a')">
-						<u--input :value="user.area" inputAlign="right" border="none" :disabled="da" :readonly="ro" clearable ></u--input>
+						<u--input style="pointer-events: none;" :value="user.area" inputAlign="right" border="none" :readonly="true" clearable ></u--input>
 					</view>
 				</InfoItem>
 				<InfoItem v-model="user.address" :ph="languageData.me.addrDetail" :title="languageData.me.addrDetail"
@@ -44,7 +44,7 @@
 				</view>
 			</uni-list>
 		</view>
-		<button @click="modifySimple()" v-show="user.status === '2' || true" class="submit-btn"
+		<button @click="modifySimple()" v-show="['1','2','3'].includes(user.status)" class="submit-btn"
 			style="border-radius: 10px;">{{languageData.settings.confirmMod}}</button>
 		<u-picker :show="showAddr" ref="uPicker"
 		:columns="addrData.province"
@@ -117,7 +117,6 @@
 					if (res.code === 200) {
 						this.$store.dispatch('GetInfo').then(res => {
 							setTimeout(() => {
-								this.$refs.loading.close();
 								setTimeout(() => {
 									this.$modal.msgSuccess(this.languageData.updateSuccess)
 									uni.switchTab({
@@ -128,7 +127,6 @@
 						})
 					}
 				}).catch(e => {
-					this.$refs.loading.close();
 				})
 			},
 			getUser() {