Merge remote-tracking branch 'origin/master'

src/utils/http/axios/index.ts

@@ -118,10 +118,7 @@ const transform: AxiosTransform = {
           config.params = undefined;
         }
         if (joinParamsToUrl) {
-          config.url = setObjToUrlParams(
-            config.url as string,
-            Object.assign({}, config.params, config.data),
-          );
+          config.url = setObjToUrlParams(config.url as string, Object.assign({}, config.params, config.data));
         }
       } else {
         // 兼容restful风格
@@ -200,7 +197,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
         // authentication schemes，e.g: Bearer
         // authenticationScheme: 'Bearer',
         authenticationScheme: '',
-        timeout: 10 * 1000,
+        timeout: 30 * 1000,
         // 基础接口地址
         // baseURL: globSetting.apiUrl,
 

src/views/product/goods-category/modal.vue

@@ -168,6 +168,14 @@
     },
   );
 
+  watch(
+    () => formData.parentId,
+    (n) => {
+      if (n === 0) {
+        formData.name = formData.lineName;
+      }
+    },
+  );
   onMounted(() => {
     handleGetLineList();
   });