Browse Source

fix(bugs): 修改对应的buge

tangning 3 years ago
parent
commit
0f39ff5e4c

+ 6 - 2
src/views/advertisement/list.vue

@@ -4,6 +4,9 @@
       <template #toolbar>
         <a-button type="primary" @click="handleCreate">新增</a-button>
       </template>
+      <template #time="{ record }">
+        <Time v-if="record.createTime" :value="record.createTime" mode="date" />
+      </template>
       <template #img="{ record }">
         <TableImg :size="200" :simpleShow="true" :imgList="[record.image]" />
       </template>
@@ -36,11 +39,12 @@
   import { BasicTable, useTable, BasicColumn, TableAction, TableImg } from '/@/components/Table';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useDrawer } from '/@/components/Drawer';
+  import { Time } from '/@/components/Time';
   import listDrawer from './listDrawer.vue';
   import { ListApi, itemDeletelApi } from '/@/api/advertisement/list';
   // param type 2
   export default defineComponent({
-    components: { BasicTable, TableAction, TableImg, listDrawer },
+    components: { BasicTable, TableAction, TableImg, listDrawer, Time },
     setup() {
       const { createMessage } = useMessage();
       const [registerDrawer, { openDrawer }] = useDrawer();
@@ -65,7 +69,7 @@
         {
           title: '编辑时间',
           dataIndex: 'createTime',
-          component: 'Time',
+          slots: { customRender: 'time' },
           width: 150,
         },
 

+ 1 - 3
src/views/advertisement/listDrawer.vue

@@ -61,9 +61,7 @@
           httpApi({
             ...modelRef.value,
             ...data,
-            image:
-              'http://zfb-4dkankan.oss-cn-shenzhen.aliyuncs.com/scene/1546422941329_测试.png' ??
-              data.image.toString(),
+            image: data.image[0],
           }).then((res) => {
             console.log('itemUpdateApi', res);
             setProps({

+ 1 - 1
src/views/advertisement/pads.vue

@@ -131,7 +131,7 @@
       //   ],
       // };reload
 
-      const [registerTable, { getForm }] = useTable({
+      const [registerTable, { getForm, reload }] = useTable({
         title: '推荐位',
         api: RecommendListApi,
         columns: columns,

+ 5 - 5
src/views/advertisement/schemas.ts

@@ -32,10 +32,14 @@ export const padsSchemas: FormSchema[] = [
     field: 'connectId',
     label: '直播ID',
     component: 'ApiSelect',
+    required: true,
+    itemProps: {
+      validateTrigger: 'blur',
+    },
     componentProps: {
       api: BrandListApi,
       // resultField: 'list',
-      numberToString: true,
+      // numberToString: true,
       labelField: 'name',
       valueField: 'id',
       immediate: true,
@@ -44,10 +48,6 @@ export const padsSchemas: FormSchema[] = [
         limit: 1000,
       },
     },
-    colProps: {
-      xl: 5,
-      xxl: 5,
-    },
   },
   // {
   //   field: 'connectId',

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

@@ -40,10 +40,9 @@
       field: 'contacts',
       component: 'Input',
       label: t('routes.corporation.managerName'),
-
       required: true,
       componentProps: {
-        maxLength: 85,
+        maxLength: 18,
       },
       colProps: {
         span: 22,

+ 3 - 0
src/views/corporation/detailsModal.vue

@@ -98,6 +98,9 @@
           label: '联系人',
           slot: 'text',
           component: 'Input',
+          componentProps: {
+            maxLength: 20,
+          },
         },
         // {
         //   field: 'companyName',

+ 9 - 3
src/views/order/list.vue

@@ -321,12 +321,18 @@
             return '待付款';
           case 101:
             return '已取消';
+          case 102:
+            return '已删除';
           case 201:
             return '已付款';
-          case 1:
+          case 300:
             return '已发货';
-          case 2:
+          case 301:
             return '已收货';
+          case 401:
+            return '退款';
+          case 402:
+            return '退款退货';
           case 501:
             return '完成';
           default:
@@ -350,7 +356,7 @@
           case 1:
             return '已付款';
           default:
-            return '';
+            return '已付款';
         }
       }
       // function onSelectChange(selectedRowKeys: (string | number)[]) {

+ 12 - 0
src/views/product/drawer.data.ts

@@ -30,18 +30,27 @@ export const formSchema: FormSchema[] = [
     label: '序列号',
     component: 'Input',
     required: true,
+    componentProps: {
+      maxLength: 3,
+    },
   },
   {
     field: 'name',
     label: '商品名称',
     component: 'Input',
     required: true,
+    componentProps: {
+      maxLength: 25,
+    },
   },
   {
     field: 'goodsSimpleDesc',
     label: '商品描述',
     component: 'Input',
     required: true,
+    componentProps: {
+      maxLength: 200,
+    },
   },
   {
     field: 'brandName',
@@ -58,6 +67,9 @@ export const formSchema: FormSchema[] = [
         suffix: () => '仅支持京东链接',
       };
     },
+    componentProps: {
+      maxLength: 200,
+    },
     rules: [
       {
         validator: async (_, value) => {

+ 30 - 27
src/views/product/goodsSpecs.vue

@@ -38,13 +38,13 @@
   import { defineComponent, ref, reactive, onMounted } from 'vue';
   import { Icon } from '/@/components/Icon';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
-  import { uploadApi } from '/@/api/advertisement/list';
+  // import { uploadApi } from '/@/api/advertisement/list';
   // import { useMessage } from '/@/hooks/web/useMessage';
   import { queryAll } from '/@/api/product/list';
 
   interface valList {
     name: string;
-    picUrl: string;
+    // picUrl: string;
     uuid: string;
   }
   interface ProductListItem {
@@ -95,6 +95,7 @@
             },
             required: true,
             componentProps: {
+              maxLength: 15,
               api: queryAll,
               fieldNames: {
                 label: 'name',
@@ -123,29 +124,32 @@
             component: 'Input',
             required: true,
             colProps: {
-              span: 8,
-            },
-          },
-          {
-            field: 'picUrl_' + number + '_' + val,
-            component: 'Upload',
-            required: true,
-            label: '规格图',
-            colProps: {
-              span: 10,
-            },
-            itemProps: {
-              validateTrigger: 'blur',
+              span: 18,
             },
             componentProps: {
-              api: uploadApi,
-              maxgoodsNumber: 1,
-              afterFetch: function (data) {
-                Reflect.set(data, 'url', data.message);
-                return data;
-              },
+              maxLength: 15,
             },
           },
+          // {
+          //   field: 'picUrl_' + number + '_' + val,
+          //   component: 'Upload',
+          //   required: true,
+          //   label: '规格图',
+          //   colProps: {
+          //     span: 10,
+          //   },
+          //   itemProps: {
+          //     validateTrigger: 'blur',
+          //   },
+          //   componentProps: {
+          //     api: uploadApi,
+          //     maxgoodsNumber: 1,
+          //     afterFetch: function (data) {
+          //       Reflect.set(data, 'url', data.message);
+          //       return data;
+          //     },
+          //   },
+          // },
           {
             field: number + '_' + val,
             label: '',
@@ -210,7 +214,7 @@
                 for (var valIndex = 1; valIndex < ele.val.length; valIndex++) {
                   addBut(`add_${valIndex}`);
                   setVlaue[`goodsSn_${index}_${valIndex}`] = ele.val[valIndex].name;
-                  setVlaue[`picUrl_${index}_${valIndex}`] = ele.val[valIndex].picUrl;
+                  // setVlaue[`picUrl_${index}_${valIndex}`] = ele.val[valIndex].picUrl;
                 }
               }
             } else {
@@ -218,7 +222,7 @@
               for (var valIndex = 1; valIndex < ele.val.length; valIndex++) {
                 addBut(`add_${valIndex}`);
                 setVlaue[`goodsSn_${index}_${valIndex}`] = ele.val[valIndex].name;
-                setVlaue[`picUrl_${index}_${valIndex}`] = ele.val[valIndex].picUrl;
+                // setVlaue[`picUrl_${index}_${valIndex}`] = ele.val[valIndex].picUrl;
               }
             }
             setFieldsValue(setVlaue);
@@ -243,7 +247,7 @@
           'listfield',
           list.filter((ele) => ele !== item),
         );
-        removeSchemaByFiled([`goodsSn_${field}`, `picUrl_${field}`, `${field}`]);
+        removeSchemaByFiled([`goodsSn_${field}`, `${field}`]);
         ggList.list[number] = {
           value: value - 1,
           list: list.filter((ele) => ele !== value - 1),
@@ -257,7 +261,7 @@
         console.log('addBut', data);
         data.list &&
           data.list.map((ele) => {
-            let child = [`goodsSn_${item}_${ele}`, `picUrl_${item}_${ele}`, `${item}_${ele}`];
+            let child = [`goodsSn_${item}_${ele}`, `${item}_${ele}`];
             delList = delList.concat(child);
           });
         removeSchemaByFiled(delList);
@@ -332,10 +336,9 @@
           let name = getData[`name_${index}`];
           let val: valList[] = [];
           ele.list.map((element) => {
-            console.log('element', getData, getData[`picUrl_${index}_${element}`]);
             val.push({
               name: getData[`goodsSn_${index}_${element}`],
-              picUrl: getData[`picUrl_${index}_${element}`][0],
+              // picUrl: getData[`picUrl_${index}_${element}`][0],
               uuid: `${index}-${element}`,
             });
             productList.push({

+ 3 - 1
src/views/product/productDrawer.vue

@@ -55,7 +55,7 @@
   import { InfoApi, UpdateSaleApi, SaveSaleApi } from '/@/api/product/list';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useI18n } from '/@/hooks/web/useI18n';
-  // import { useUserStore } from '/@/store/modules/user';
+  import { useUserStore } from '/@/store/modules/user';
   // import { getMenuList } from '/@/api/system/system';
   import { makeTree, TreeNode } from '/@/utils/treeUtils';
   import { categoryApi } from '/@/api/product/category';
@@ -94,6 +94,7 @@
       const isUpdate = ref(true);
       const goodsRef = ref();
       const { createMessage } = useMessage();
+      const userStore = useUserStore();
       const userinfo = computed(() => userStore.getUserInfo);
       const { t } = useI18n();
 
@@ -122,6 +123,7 @@
                 const treeData = makeTree(res);
                 return treeData;
               },
+              maxLength: 15,
               fieldNames: {
                 label: 'name',
                 key: 'id',

+ 1 - 0
src/views/scenes/list.vue

@@ -40,6 +40,7 @@
             {
               color: 'error',
               label: t('routes.scenes.makeLiveCover'),
+              ifShow: record.lived !== true,
               onClick: generateDefaultLiveRoom.bind(null, record),
             },
           ]"