|
@@ -38,7 +38,8 @@
|
|
|
<span> {{ relationObj.username }}</span>
|
|
|
</div>
|
|
|
</div> -->
|
|
|
- <van-field v-model="relationObj.relationUsername" name="password" :label="$t('merchantManage.relationAdmin')"
|
|
|
+ <van-field v-model="relationObj.relationUsername" name="password"
|
|
|
+ :label="$t('merchantManage.relationAdmin')"
|
|
|
:placeholder="$t('merchantManage.relationAdminPlaceholder')" />
|
|
|
<van-field v-model="adminObj.name" name="password" :label="$t('merchantManage.fullNameLabel')"
|
|
|
:placeholder="$t('merchantManage.fullNamePlaceholder')"
|
|
@@ -245,46 +246,52 @@ export default {
|
|
|
// console.log('getHuifuMchFun', data);
|
|
|
}
|
|
|
const onSubmit = async () => {
|
|
|
- // console.log("relationUsername:", relationObj.value.relationUsername);
|
|
|
- const { result } = await getRelationAdminId({ relationUsername: relationObj.value.relationUsername });
|
|
|
- if (result.code === "00000") {
|
|
|
- if (result.data != null) {
|
|
|
- adminObj.value.relationAdminId = result.data;
|
|
|
+ try {
|
|
|
+ const result = await getRelationAdminId({ relationUsername: relationObj.value.relationUsername });
|
|
|
+ // console.log("result.data.data --> ", result.data.data);
|
|
|
+ if (result.data.code === "00000") {
|
|
|
+ if (result.data.data != null) {
|
|
|
+ adminObj.value.relationAdminId = result.data.data;
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- const params = {
|
|
|
- id: adminObj.value.id,
|
|
|
- name: adminObj.value.name,
|
|
|
- username: adminObj.value.username,
|
|
|
- relationAdminId: adminObj.value.relationAdminId,
|
|
|
- ifForeign: adminObj.value.ifForeign,
|
|
|
- phone: adminObj.value.phone,
|
|
|
- email: adminObj.value.email,
|
|
|
- tradeMerchantNo: adminObj.value.tradeMerchantNo,
|
|
|
- };
|
|
|
- if (adminType.value === 0 || adminType.value === 1) {
|
|
|
- params.promoCodeOpen = adminObj.value.promoCodeOpen;
|
|
|
- params.applyStartTime = adminObj.value.applyStartTime;
|
|
|
- params.applyEndTime = adminObj.value.applyEndTime;
|
|
|
- params.payPlatform = adminObj.value.payPlatform;
|
|
|
- }
|
|
|
- if (adminObj.value.password !== '') {
|
|
|
- if (adminObj.value.checkPassword === '') { showFailToast(t('merchantManage.confirmPasswordPlaceholder')); return; }
|
|
|
- if (adminObj.value.password === adminObj.value.checkPassword) {
|
|
|
- params.password = adminObj.value.password;
|
|
|
- } else {
|
|
|
- showFailToast(t('merchantManage.theTwoPasswordsAreDifferent'));
|
|
|
+ // console.log("relationAdminId --> ", adminObj.value.relationAdminId);
|
|
|
+ const params = {
|
|
|
+ id: adminObj.value.id,
|
|
|
+ name: adminObj.value.name,
|
|
|
+ username: adminObj.value.username,
|
|
|
+ relationAdminId: adminObj.value.relationAdminId,
|
|
|
+ ifForeign: adminObj.value.ifForeign,
|
|
|
+ phone: adminObj.value.phone,
|
|
|
+ email: adminObj.value.email,
|
|
|
+ tradeMerchantNo: adminObj.value.tradeMerchantNo,
|
|
|
+ };
|
|
|
+ if (adminType.value === 0 || adminType.value === 1) {
|
|
|
+ params.promoCodeOpen = adminObj.value.promoCodeOpen;
|
|
|
+ params.applyStartTime = adminObj.value.applyStartTime;
|
|
|
+ params.applyEndTime = adminObj.value.applyEndTime;
|
|
|
+ params.payPlatform = adminObj.value.payPlatform;
|
|
|
}
|
|
|
+ if (adminObj.value.password !== '') {
|
|
|
+ if (adminObj.value.checkPassword === '') { showFailToast(t('merchantManage.confirmPasswordPlaceholder')); return; }
|
|
|
+ if (adminObj.value.password === adminObj.value.checkPassword) {
|
|
|
+ params.password = adminObj.value.password;
|
|
|
+ } else {
|
|
|
+ showFailToast(t('merchantManage.theTwoPasswordsAreDifferent'));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ const { data } = await updateAdmin(params);
|
|
|
+ if (data.code === "00000") {
|
|
|
+ showSuccessToast(t('merchantManage.modificationSucceeded'));
|
|
|
+ setTimeout(() => {
|
|
|
+ // router.go(0);
|
|
|
+ getAdminFun();
|
|
|
+ }, 1500);
|
|
|
+ } else { showFailToast(data.message); }
|
|
|
+ console.log('onSubmit', data);
|
|
|
+ } catch (error) {
|
|
|
+ // 如果上面的方法执行失败,会执行到这里
|
|
|
+ console.error('提交管理员信息失败', error);
|
|
|
}
|
|
|
- const { data } = await updateAdmin(params);
|
|
|
- if (data.code === "00000") {
|
|
|
- showSuccessToast(t('merchantManage.modificationSucceeded'));
|
|
|
- setTimeout(() => {
|
|
|
- // router.go(0);
|
|
|
- getAdminFun();
|
|
|
- }, 1500);
|
|
|
- } else { showFailToast(data.message); }
|
|
|
- console.log('onSubmit', data);
|
|
|
}
|
|
|
return {
|
|
|
tabType,
|