diff --git a/src/api/mine.js b/src/api/mine.js
index 71f20753..3d8da605 100644
--- a/src/api/mine.js
+++ b/src/api/mine.js
@@ -133,6 +133,15 @@ export function getContactQrCodeResult(data){
})
}
+// 添加企微
+export function updateWechatId(data){
+ return request({
+ url:'/supplier/potential/updateWechatId',
+ method:'POST',
+ data
+ })
+}
+
//司机列表
export function driverList(data){
return request({
diff --git a/src/views/index/supplierAdd.vue b/src/views/index/supplierAdd.vue
index 48d1cc60..f64edac6 100644
--- a/src/views/index/supplierAdd.vue
+++ b/src/views/index/supplierAdd.vue
@@ -85,8 +85,8 @@
-
-
+
+
-
+
@@ -138,6 +138,7 @@
errorMsg: '',
phoneVerify: [{ required: true, message: '请输入联系电话' }, { validator: value => { return /^1[3456789]\d{9}$/.test(value) }, message: '联系电话格式不正确' }],
emailVerify: [{ required: true, message: '请输入邮箱' }, { validator: value => { return /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/.test(value) }, message: '邮箱格式不正确' }],
+ countVerify: [{ required: true, message: '请输入数量' }, { validator: value => /^\d+$/.test(value) && Number(value) >= 0, message: '请输入大于等于0的整数' }],
id:'', //车辆Id
idBackPhotoList: [],
idBackPhoto: '',
@@ -201,6 +202,12 @@
}
},
async mounted() {
+ const lastRoute = localStorage.getItem('lastRoute');
+ if (lastRoute) {
+ const { name, query } = JSON.parse(lastRoute);
+ this.$router.replace({ name, query });
+ return;
+ }
const urlParams = new URLSearchParams(window.location.search);
this.id = this.$route.query.id || urlParams.get('id');
await this.getAreaTree();
@@ -221,7 +228,6 @@
});
this.configId = res?.configId;
this.qrCode = res?.qrCode
- console.log('idid', res);
},
async getInfoHandler() {
let res = await getSupplierInfo({
@@ -255,7 +261,6 @@
}
if(_data?.serviceAreaCode) {
this.$set(this.form, 'serviceAreaCode', _data?.serviceAreaCode.split(',').map(item => Number(item)));
- // this.form.serviceAreaCode = _data?.serviceAreaCode.split(',').map(item => Number(item));
}
},
showError(msg) {
@@ -291,19 +296,6 @@
this.showError('服务区域不能为空')
return
}
- if( !this.qrCode && !this.id) {
- await this.QrCodeHandler();
- this.showError('请先添加下方企微再申请')
- return
- }
- // this.wechatId='wmOTNXBwAABrvKkE_Fh8ZN8Xm2S9v2wQ'
- if(!this.wechatId) {
- await this.QrCodeResult();
- if( !this.wechatId ) {
- this.showError('请先添加企微再申请')
- return
- }
- }
if( this.$refs.tree.getCheckedKeys().length > 0 ) {
await this.saveHandler()
}
@@ -312,7 +304,6 @@
let res = await getContactQrCodeResult({
configId: this.configId
});
- console.log('resres', res)
this.wechatId = res?.data?.wechatId
},
async saveHandler() {
@@ -335,17 +326,28 @@
accountUrl:this.licensePhoto,
service: this.$refs.tree.getCheckedKeys().join(',') ,
serviceAreaCode: checkArr.join(','),
- wechatId: this.wechatId,
- });
- Dialog.alert({
- title: '提示',
- message: "操作成功"
- }).then(async () => {
- this.goPage('supplierAddResult', { id : res?.data })
- setTimeout(() => {
- this.clickFlag = true
- }, 1000)
});
+ console.log('rererere', res)
+ if( res?.noToast ) { // 服务商已存在
+ this.showError('当前服务商已存在')
+ if( res?.code != 0 ) {
+ const target = { name: 'supplierAddResult', query: { id: res?.code } };
+ localStorage.setItem('lastRoute', JSON.stringify(target));
+ this.goPage('supplierAddResult', { id : res?.code })
+ }
+ } else {
+ Dialog.alert({
+ title: '提示',
+ message: "操作成功"
+ }).then(async () => {
+ const target = { name: 'supplierAddResult', query: { id: res?.data } };
+ localStorage.setItem('lastRoute', JSON.stringify(target));
+ this.goPage('supplierAddResult', { id : res?.data })
+ setTimeout(() => {
+ this.clickFlag = true
+ }, 1000)
+ });
+ }
} catch (e) {
this.showError(e)
} finally {
diff --git a/src/views/index/supplierAddResult.vue b/src/views/index/supplierAddResult.vue
index 0a191d35..bbb39044 100644
--- a/src/views/index/supplierAddResult.vue
+++ b/src/views/index/supplierAddResult.vue
@@ -5,6 +5,12 @@
信息录入完成,请等待审核结果。
+
+
请先添加企业微信,保证申请流程正常进行。
+
+
![企业微信二维码]()
+
+
@@ -12,22 +18,83 @@