1

.env.development

@@ -6,7 +6,7 @@ VITE_PUBLIC_PATH = ./
 
 # Cross-domain proxy, you can configure multiple
 # Please note that no line breaks
-VITE_PROXY = [["/qjkankan","https://test.4dkankan.com/qjkankan"],["/takelook","https://v4-test.4dkankan.com/takelook"],["/upload","https://v4-uat.4dkankan.com/service/manage/common/upload/files"],["/service","https://v4-uat.4dkankan.com/service"],["/ucenter","https://v4-uat.4dkankan.com/ucenter"]]
+VITE_PROXY = [["/qjkankan","https://test.4dkankan.com/qjkankan"],["/takelook","https://v4-test.4dkankan.com/takelook"],["/upload","https://v4-uat.4dkankan.com/service/manage/common/upload/files"],["/service","https://testeur.4dkankan.com/service"],["/ucenter","https://testeur.4dkankan.com/ucenter"]]
 # VITE_PROXY=[["/api","https://vvbin.cn/test"]]
 
 # Delete console

src/api/account/index.ts

@@ -15,6 +15,7 @@ enum Api {
   cameraAllType = '/service/manage/cameraType/allList',
   wifiPrefixAll = '/service/manage/cameraWifiPrefix/allList',
   incrementUseTypeList = '/service/manage/incrementUseType/allList',
+  getAddUserIncrementTime = '/service/manage/user/getAddUserIncrementTime',
 }
 
 /**
@@ -78,6 +79,17 @@ export const dincrementList = (params: PageParams) =>
     },
   });
 
+//延期时间
+export const getAddUserIncrementTime = (params: PageParams) =>
+  defHttp.post<userList>({
+    url: Api.getAddUserIncrementTime,
+    params: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
 //添加用户权益
 export const AddUserIncrementApi = (params: PageParams) =>
   defHttp.post<userList>({

src/views/account/overview/AddModal.vue

@@ -24,7 +24,7 @@
   import { useI18n } from '/@/hooks/web/useI18n';
   import { uploadApi } from '/@/api/product/index';
   import { ResultEnum } from '/@/enums/httpEnum';
-  import { DetailsApi, dincrementList, AddUserIncrementApi, AddDownNumApi } from '/@/api/account';
+  import { DetailsApi, dincrementList, AddUserIncrementApi, getAddUserIncrementTime } from '/@/api/account';
   import dayjs from 'dayjs';
   import { otherInfoStore } from '/@/store/modules/other';
 
@@ -234,8 +234,15 @@
         ]);
       });
       async function onDataReceive(data) {
-        let incrementEndTime = dayjs().isBefore(data.incrementEndTime) ? data.incrementEndTime : dayjs().format('YYYY-MM-DD HH:mm:ss');
-        const res = await dincrementList();
+        let incrementEndTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
+        if( data.incrementTypeId ){
+          const res = await getAddUserIncrementTime({
+            id: data.id,
+            userId: data.userId,
+            incrementTypeId: data.incrementTypeId,
+          });
+          incrementEndTime = dayjs(res.deadLine).format('YYYY-MM-DD HH:mm:ss');
+        }
         console.log('onDataReceive', data, res);
         title.value = data.id ? '续费权益' : '新增权益';
         resetFields();
@@ -243,7 +250,8 @@
         fileFlow.id = data.id;
         setFieldsValue({
           ...data,
-          incrementEndTime: dayjs(incrementEndTime).add(1, data.incrementTypeId == '3' ? 'month' : 'year').format('YYYY-MM-DD'),
+          incrementEndTime,
+          // incrementEndTime: dayjs(incrementEndTime).add(1, data.incrementTypeId == '3' ? 'month' : 'year').format('YYYY-MM-DD'),
         });
       }
       function showOptions(type = 5){