tangning 2 lat temu
rodzic
commit
3c99d2c80b

+ 1 - 1
src/utils/http/axios/index.ts

@@ -201,7 +201,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
         // authentication schemes,e.g: Bearer
         // authenticationScheme: 'Bearer',
         authenticationScheme: '',
-        timeout: 60 * 1000,
+        // timeout: 60 * 1000,
         // 基础接口地址
         // baseURL: globSetting.apiUrl,
 

+ 1 - 1
src/views/account/overview/interesModal.vue

@@ -142,7 +142,7 @@
         createConfirm({
           iconType: 'warning',
           title: () => h('span', '续费提示'),
-          content: () => h('span', `您确定给权益ID${record.id}续期1年!`),
+          content: () => h('span', `您确定给权益ID${record.id}续期${record.validTimeType == 4?'1月':'1年'}!`),
           onOk: async () => {
             await await IncrementDelayApi({id:record.id,year:1})
             createMessage.success(t('common.optSuccess'));

+ 3 - 2
src/views/dealer/components/addModal.vue

@@ -79,13 +79,14 @@
                 // @ts-ignore
                 validator: async (rule, value) => {
                   console.log('value',value)
+                  const regEmail = /^\w+@\w+\.\w+$/i
                   const regPos = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/; // 非中文
                   if (!value) {
                     return Promise.reject('请输入四维看看账号');
                   }
-                  if (!regPos.test(value)) {
+                  if (!(regPos.test(value) || regEmail.test(value))) {
                     /* eslint-disable-next-line */
-                    return Promise.reject('请输入正确的手机号');
+                    return Promise.reject('请输入正确的号');
                   }
                   let res = await checkUser({userName:value})
                   if(!res){