Kaynağa Gözat

fix(bugs): 修改问题

tangning 3 yıl önce
ebeveyn
işleme
185a09ff5c

+ 1 - 1
src/api/product/model.ts

@@ -11,7 +11,7 @@ export interface addCategoryParams {
   name: string;
   type: number;
   parentId?: string;
-  wapBannerUrl: string;
+  wapBannerUrl?: string;
 }
 export interface OrderListItem {
   id: number;

+ 1 - 0
src/components/Upload/src/UploadModal.vue

@@ -126,6 +126,7 @@
         const { size, name } = file;
         const { maxSize, accept } = props;
         const type = name.split('.').pop() || '';
+        console.log('beforeUpload', type, name);
         if (accept && accept.length > 0 && !accept.includes(type.toLowerCase())) {
           createMessage.error(t('component.upload.accept', [accept.join(',')]));
           return false;

+ 0 - 8
src/store/modules/user.ts

@@ -204,14 +204,6 @@ export const useUserStore = defineStore({
       if (!isArray(value)) {
         return roleList?.includes(value as RoleEnum);
       }
-      console.log(
-        (intersection(value, roleList) as RoleEnum[]).length > 0,
-        'intersection(value, roleList)',
-        intersection(value, roleList),
-        'value, roleList',
-        value,
-        roleList,
-      );
       return (intersection(value, roleList) as RoleEnum[]).length > 0;
     },
   },

+ 2 - 2
src/views/corporation/AddCorporationModal.vue

@@ -150,7 +150,7 @@
       rules: [{ required: true, message: '请选择上传文件' }],
       helpMessage: '支持png  jpg图片格式',
       itemProps: {
-        validateTrigger: 'blur',
+        validateTrigger: 'onBlur',
       },
       componentProps: {
         api: uploadLogoApi,
@@ -175,7 +175,7 @@
       required: true,
       rules: [{ required: true, message: '请选择上传文件' }],
       itemProps: {
-        validateTrigger: 'blur',
+        validateTrigger: 'onBlur',
       },
       helpMessage: '支持png  jpg图片格式',
       componentProps: {

+ 1 - 1
src/views/corporation/index.vue

@@ -42,7 +42,7 @@
           :api="handleMusicUploadFetch"
           class="my-5"
           :value="[record.bgMusic]"
-          :accept="['.mp3', '.wav']"
+          :accept="['mp3', 'wav']"
         />
       </template>
       <template #expirationTime="{ record }">

+ 0 - 10
src/views/corporation/verify.vue

@@ -134,16 +134,6 @@
         formConfig: searchForm,
         showTableSetting: true,
         tableSetting: { fullScreen: true },
-        handleSearchInfoFn: function (searchData) {
-          if (searchData.fieldTime) {
-            searchData.startTime = searchData.fieldTime[0];
-            searchData.endTime = searchData.fieldTime[1];
-            delete searchData.fieldTime;
-          }
-          console.log('searchData', searchData);
-
-          return searchData;
-        },
         showIndexColumn: false,
         rowKey: 'id',
         //TODO

+ 10 - 3
src/views/product/addCategoryModal.vue

@@ -19,6 +19,7 @@ wapBannerUrl: "https://4dkk.4dage.com/shop/huafa/20220302/23135195983e96.png?x-o
   import { TreeNode } from '/@/utils/treeUtils';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
   const isLevel2 = (type: string) => type === 'L2';
   const schemas: FormSchema[] = [
@@ -101,6 +102,9 @@ wapBannerUrl: "https://4dkk.4dage.com/shop/huafa/20220302/23135195983e96.png?x-o
       colProps: {
         span: 24,
       },
+      componentProps: {
+        min: 0,
+      },
     },
     {
       field: 'wapBannerUrl',
@@ -127,6 +131,7 @@ wapBannerUrl: "https://4dkk.4dage.com/shop/huafa/20220302/23135195983e96.png?x-o
     },
     emits: ['update', 'register'],
     setup(_, { emit }) {
+      const { createMessage } = useMessage();
       const [registerForm, { validate, getFieldsValue, resetFields }] = useForm({
         labelWidth: 120,
         schemas,
@@ -157,14 +162,16 @@ wapBannerUrl: "https://4dkk.4dage.com/shop/huafa/20220302/23135195983e96.png?x-o
               name: data.name,
               parentId: data.parentId,
               type: data.type,
-              wapBannerUrl: data.wapBannerUrl[0] || '',
+              // wapBannerUrl: data.wapBannerUrl[0] || '',
             });
             emit('update');
             resetFields();
+            createMessage.success('操作成功');
             closeModal();
           }
-        } catch (error) {}
-
+        } catch (error) {
+          console.log('error', error);
+        }
         // let res = await saveItemApi(data);
       }
 

+ 3 - 0
src/views/product/editCategoryModal.vue

@@ -110,6 +110,9 @@ wapBannerUrl: "https://4dkk.4dage.com/shop/huafa/20220302/23135195983e96.png?x-o
       colProps: {
         span: 24,
       },
+      componentProps: {
+        min: 0,
+      },
     },
     {
       field: 'wapBannerUrl',

+ 4 - 3
src/views/product/goodsSpecs.vue

@@ -184,6 +184,7 @@
           appendSchemaByField,
           validate,
           getFieldsValue,
+          resetFields,
         },
       ] = useForm({
         labelWidth: 120,
@@ -196,7 +197,7 @@
         //初始化组装数据
         let goodsgg = [],
           setVlaue: {};
-        console.log('ele', props.editdata);
+        console.log('ele', props.editdata, goodsgg);
         if (props.editdata.goodsSpecificationList) {
           let guigeArr = props.editdata.goodsSpecificationList;
           guigeArr.map((ele, index) => {
@@ -228,9 +229,9 @@
               }
             }
             setFieldsValue(setVlaue);
-            console.log('index', index, ele, setVlaue);
           });
-          console.log('初始化数据', guigeArr, 'props', props.editdata, goodsgg);
+        } else {
+          resetFields();
         }
       }
       function setForm() {

+ 5 - 5
src/views/product/list.data.ts

@@ -51,11 +51,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'name',
     width: 160,
   },
-  {
-    title: '商品描述',
-    dataIndex: 'goodsSimpleDesc',
-    width: 150,
-  },
+  // {
+  //   title: '商品描述',
+  //   dataIndex: 'goodsSimpleDesc',
+  //   width: 150,
+  // },
   {
     title: '购买链接',
     dataIndex: 'realShopUrl',

+ 2 - 3
src/views/scenes/live.vue

@@ -290,9 +290,8 @@
       async function handleDeleteLiveScene(record: Recordable) {
         try {
           const id = [record.id];
-          const res = await LiveSceneDeleteApi(id);
-          console.log('res', res);
-          // createMessage.success(t('common.optSuccess'));
+          await LiveSceneDeleteApi(id);
+          createMessage.success(t('common.optSuccess'));
           reload();
         } catch (error) {}
       }

+ 1 - 0
src/views/staff/detailsModal.vue

@@ -178,6 +178,7 @@
         let data = await validate();
         const requestApi = data.id ? updateApi : saveApi;
         let res = await requestApi({
+          ...data,
           userName: data.phone,
           phone: data.phone,
           nickName: data.nickName,

+ 5 - 1
src/views/staff/list.vue

@@ -94,7 +94,11 @@
       onMounted(() => {
         getNumByStaff({}).then((res) => {
           let { totalSubNum = 0 } = res;
-          surplusSubNum.value = totalSubNum;
+          try {
+            surplusSubNum.value = res.subNum - totalSubNum;
+          } catch (error) {
+            surplusSubNum.value = 0;
+          }
         });
       });
       const columns: BasicColumn[] = [

+ 5 - 0
src/views/system/role/index.vue

@@ -35,6 +35,7 @@
   import { getRoleListByPage, deleteRoleApi } from '/@/api/system/system';
   import { useDrawer } from '/@/components/Drawer';
   import RoleDrawer from './RoleDrawer.vue';
+  import { useUserStore } from '/@/store/modules/user';
 
   import { columns, searchFormSchema } from './role.data';
 
@@ -43,6 +44,8 @@
     components: { BasicTable, RoleDrawer, TableAction },
     setup() {
       const [registerDrawer, { openDrawer }] = useDrawer();
+      const userStore = useUserStore();
+      const { getCheckRole } = userStore;
       const [registerTable, { reload }] = useTable({
         title: '角色列表',
         api: getRoleListByPage,
@@ -56,6 +59,7 @@
         bordered: true,
         showIndexColumn: false,
         actionColumn: {
+          ifShow: getCheckRole('super'),
           width: 130,
           title: '操作',
           dataIndex: 'action',
@@ -99,6 +103,7 @@
         handleEdit,
         handleDelete,
         handleSuccess,
+        getCheckRole,
       };
     },
   });