更换正式环境，测试修改

pages/login/index.vue

@@ -13,26 +13,27 @@
 						textKey="label"></my-tabs>
 				</view>
 				<view v-if="vdata.loginType == 'pwd' ">
-					<template v-if="accountType.sel==1">
-						<uni-forms-item name="merchantName">
-							<uni-easyinput class='jeepay-easyinput' placeholder="请输入商户号"
-								v-model="vdata.formData.merchantName" :clearable="false">
-								<template #prefixIcon>
-									<image src="@/static/login/icon-user.svg" class="input-icon" />
-								</template>
-							</uni-easyinput>
-						</uni-forms-item>
-					</template>
+					
 
 					<uni-forms-item name="username">
-						<uni-easyinput class='jeepay-easyinput' placeholder="请输入登录名/手机号"
+						<uni-easyinput class='jeepay-easyinput' :placeholder="accountType.sel==1?'请输入商户号':'请输入登录名/手机号'"
 							v-model="vdata.formData.username" :clearable="false">
 							<template #prefixIcon>
 								<image src="@/static/login/icon-user.svg" class="input-icon" />
 							</template>
 						</uni-easyinput>
 					</uni-forms-item>
-
+					<template v-if="accountType.sel==1">
+						<uni-forms-item name="staffUserName">
+							<uni-easyinput class='jeepay-easyinput' placeholder="请输入登录名/手机号"
+								v-model="vdata.formData.staffUserName" :clearable="false">
+								<template #prefixIcon>
+									<image src="@/static/login/icon-user.svg" class="input-icon" />
+								</template>
+							</uni-easyinput>
+						</uni-forms-item>
+					</template>
+					
 					<uni-forms-item name="pwd">
 						<uni-easyinput class='jeepay-easyinput' :type="vdata.isShowPwd ? 'text' : 'password'"
 							v-model="vdata.formData.pwd" :clearable="false" placeholder="请输入登录密码">
@@ -156,7 +157,7 @@
 
 	const loginFormRef = ref()
 	const rules = {
-		merchantName: {
+		staffUserName: {
 			rules: [formUtil.rules.requiredInputShowToast('商户号')],
 		},
 		username: {
@@ -193,7 +194,7 @@
 			pwd: '', // 账密登录： 密码
 			code: '',
 			uuid: '',
-			merchantName: '',
+			staffUserName: '',
 			loginType: 1
 		},
 
@@ -210,7 +211,7 @@
 	function accountTypeChange(e) {
 		// #ifdef H5
 		if (e == 1) {
-			vdata.formData.merchantName = '18049104914'
+			vdata.formData.staffUserName = '18049104914'
 			vdata.formData.username = '13666666666'
 			vdata.formData.pwd = '123456'
 		} else {
@@ -220,7 +221,7 @@
 	}
 	watch(() => accountType.sel, (newval) => {
 		if (newval == 1) {
-			vdata.formData.merchantName = uni.getStorageSync('merchantName') || ''
+			vdata.formData.staffUserName = uni.getStorageSync('staffUserName') || ''
 		} else {
 			vdata.formData.username = ''
 		}
@@ -229,8 +230,8 @@
 		getCode()
 		// 获取商户信息,有就回显
 		let info = uni.getStorageSync('MerchantId')
-		if (info.merchantName) {
-			vdata.formData.merchantName = info.merchantName
+		if (info.staffUserName) {
+			vdata.formData.staffUserName = info.staffUserName
 			vdata.formData.username = info.username
 		}
 	})
@@ -269,7 +270,7 @@
 				}
 				//商户号参数
 				if ( accountType.sel == 1 ) {
-					params.merchantName = vdata.formData.merchantName
+					params.staffUserName = vdata.formData.staffUserName
 				}
 				loginPromise = login(params)
 				
@@ -289,7 +290,7 @@
 				loginFinishFunc(res)
 				// 保存商户号
 				uni.setStorageSync('MerchantId', {
-					merchantName: vdata.formData.merchantName,
+					staffUserName: vdata.formData.staffUserName,
 					username: vdata.formData.username,
 				})
 			}).catch(e => {