Browse Source

首次打包

xiaodai2017 2 years ago
parent
commit
cd140933d5

+ 2 - 1
package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "vite",
     "serve": "pnpm dev",
-    "build": "rimraf dist && NODE_OPTIONS=--max-old-space-size=8192 vite build",
+    "build": "rimraf dist && cross-env vite build",
     "build:staging": "rimraf dist && vite build --mode staging",
     "report": "rimraf dist && vite build",
     "preview": "vite preview",
@@ -118,6 +118,7 @@
     "@vue/runtime-core": "^3.2.40",
     "autoprefixer": "^10.4.12",
     "cloc": "^2.10.0",
+    "cross-env": "^7.0.3",
     "cssnano": "^5.1.13",
     "eslint": "^8.8.0",
     "eslint-plugin-prettier": "^4.0.0",

+ 18 - 8
pnpm-lock.yaml

@@ -52,6 +52,7 @@ specifiers:
   china-area-data: ^5.0.1
   cloc: ^2.10.0
   cropperjs: ^1.5.12
+  cross-env: ^7.0.3
   cssnano: ^5.1.13
   dayjs: ^1.11.5
   driver.js: ^0.9.8
@@ -216,6 +217,7 @@ devDependencies:
   '@vue/runtime-core': 3.2.40
   autoprefixer: 10.4.12_postcss@8.4.17
   cloc: 2.10.0
+  cross-env: 7.0.3
   cssnano: 5.1.13_postcss@8.4.17
   eslint: 8.25.0
   eslint-plugin-prettier: 4.2.1_znq2sm4m5bonjw4qqm6mwhbe2q
@@ -917,8 +919,8 @@ packages:
       vue-i18n:
         optional: true
     dependencies:
-      '@intlify/message-compiler': 9.3.0-beta.6
-      '@intlify/shared': 9.3.0-beta.6
+      '@intlify/message-compiler': 9.3.0-beta.10
+      '@intlify/shared': 9.3.0-beta.10
       jsonc-eslint-parser: 1.4.1
       source-map: 0.6.1
       vue-i18n: 9.2.2_vue@3.2.40
@@ -947,11 +949,11 @@ packages:
       '@intlify/shared': 9.2.2
       source-map: 0.6.1
 
-  /@intlify/message-compiler/9.3.0-beta.6:
-    resolution: {integrity: sha512-3PJqRJoqvFHExA9DCkf7fZYKbvYne1tYQ0fptJAhUOZsELarh8wr4aPLKWCkQSRuutdrtZ/n5CcPgJgUmVthDw==}
+  /@intlify/message-compiler/9.3.0-beta.10:
+    resolution: {integrity: sha512-RoOC6yceOykLRhN0NlbkNOBUx1el6iphx3W8NfOx3jHVNtfT1FYokx14/5sU3F1F0uxeG4sp6q+ppKvaF8o+ww==}
     engines: {node: '>= 14'}
     dependencies:
-      '@intlify/shared': 9.3.0-beta.6
+      '@intlify/shared': 9.3.0-beta.10
       source-map: 0.6.1
     dev: true
 
@@ -959,8 +961,8 @@ packages:
     resolution: {integrity: sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==}
     engines: {node: '>= 14'}
 
-  /@intlify/shared/9.3.0-beta.6:
-    resolution: {integrity: sha512-ITA1R4tvJYwZXT5x6QCSwxcwQ4dU52zrzVm/EUbgsp8oWzYS1xexBrxyNM80PSQudYvL2rvcZJKQ7yBh7b0LkQ==}
+  /@intlify/shared/9.3.0-beta.10:
+    resolution: {integrity: sha512-h93uAanbAt/XgjDHclrVB7xix6r7Uz11wx0iGNOCdHP7aA2LCJjUT3uNbekJjjbo+Fl5jzTSJZdm2SexzoqhRA==}
     engines: {node: '>= 14'}
     dev: true
 
@@ -980,7 +982,7 @@ packages:
         optional: true
     dependencies:
       '@intlify/bundle-utils': 3.2.1_vue-i18n@9.2.2
-      '@intlify/shared': 9.3.0-beta.6
+      '@intlify/shared': 9.3.0-beta.10
       '@rollup/pluginutils': 4.2.1
       debug: 4.3.4
       fast-glob: 3.2.12
@@ -2704,6 +2706,14 @@ packages:
     resolution: {integrity: sha512-re7UdjE5UnwdrovyhNzZ6gathI4Rs3KGCBSc8HCIjUo5hO42CtzyblmWLj6QWVw7huHyDMfpKxhiO2II77nhDw==}
     dev: false
 
+  /cross-env/7.0.3:
+    resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
+    engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'}
+    hasBin: true
+    dependencies:
+      cross-spawn: 7.0.3
+    dev: true
+
   /cross-spawn/7.0.3:
     resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
     engines: {node: '>= 8'}

+ 3 - 0
src/components/PageSearch/src/hooks/use-page-search.ts

@@ -19,6 +19,8 @@ export function usePageSearch(
       ? searchCallback(params)
       : { result: {}, deleteProps: [] };
 
+    console.log(result);
+    console.log(deleteProps);
     const mergeParams = {
       ...params,
       ...result
@@ -53,6 +55,7 @@ export function usePageSearch(
 
     deleteProps.forEach(key => delete mergeParams[key]);
     searchParam = mergeParams;
+    console.log(mergeParams);
     pageContentRef.value?.getPageData(mergeParams);
   }
 

+ 3 - 2
src/views/interest/account/config/modal.config.ts

@@ -20,7 +20,8 @@ const modalConfig: ModalConfig = {
       type: "select",
       label: "角色",
       placeholder: "角色",
-      options: await createRoleOptions(),
+      options: [],
+      //  await createRoleOptions(),
       rules: [{ required: true, trigger: "change", message: "请选择角色" }]
     },
     {
@@ -28,7 +29,7 @@ const modalConfig: ModalConfig = {
       type: "checkbox",
       label: "卡类型",
       placeholder: "卡类型",
-      options: await createCardOptions(),
+      options: [], //await createCardOptions(),
       rules: [{ required: true, trigger: "change", message: "请选择卡类型" }]
     }
   ]

+ 1 - 1
src/views/mobile/exchangeOrder/index.vue

@@ -40,7 +40,7 @@ function getParams() {
     params: getMergeParams(),
     name: "订单导出"
   });
-  console.log(pageContentRef);
+  // console.log(pageContentRef);
 }
 </script>
 

+ 0 - 199
src/views/operate/setComGood/cpns/project-form.vue

@@ -1,199 +0,0 @@
-<script setup lang="ts">
-import { ref, watchEffect, unref } from "vue";
-import { ElForm, ElMessage } from "element-plus";
-import { projectFormConfig } from "../config/_details";
-import { projectFormRules } from "../config/_rules";
-import { httpCateDetail } from "/@/api/operate/setComGood";
-import { BasicForm } from "/@/components/BasicForm";
-import LadderModal from "./ladder-modal.vue";
-import LadderTable from "./ladder-table.vue";
-
-import SearchTerrace from "/@/components/SearchTerrace";
-import SearchWorkCompany from "/@/components/SearchWorkCompany";
-import { transform, createDefaultData } from "/@/components/BasicForm";
-import { Customer } from "/@/components/RemoteSelect";
-import { AmountInput } from "/@/components/Input";
-import { useResponseHandle } from "/@/hooks/useAsync";
-
-const config = {
-  name: "project_name",
-  platform: "platform_name"
-};
-
-const emit = defineEmits(["create"]);
-
-const props = defineProps<{
-  data: Record<string, string>;
-  readonly: boolean;
-  id?: string;
-}>();
-
-const loading = ref(false);
-const { formItems } = projectFormConfig;
-
-const responseHandle = useResponseHandle();
-const basicFormRef = ref<InstanceType<typeof ElForm>>(null);
-const formData = ref<Record<string, any>>(createDefaultData(formItems));
-const ladderModalRef = ref<InstanceType<typeof LadderModal>>(null);
-
-function requesetCategoryById(id: string) {
-  const transform = ({ cat_name, ...rest }: any) => ({
-    ...rest,
-    name: cat_name
-  });
-  return new Promise(resolve => {
-    httpCateDetail({ id }).then(({ code, message, data }) => {
-      responseHandle({
-        code,
-        message,
-        handler: () => resolve(transform(data))
-      });
-    });
-  });
-}
-
-async function ladderTransform(ladder) {
-  loading.value = true;
-  const { ladder: _ladder } = formData.value;
-  const tasks = ladder.cat_info.map(async id => await requesetCategoryById(id));
-  ladder.cat_info = await Promise.all(tasks);
-  loading.value = false;
-  return ladder;
-}
-
-async function handlePush(_ladder) {
-  const ladder = await ladderTransform(_ladder);
-  if (!Array.isArray(formData.value.ladder)) {
-    formData.value.ladder = [];
-  }
-  formData.value.ladder.push(ladder);
-}
-
-async function handleUpdate(_ladder, index) {
-  const ladder = await ladderTransform(_ladder);
-  formData.value.ladder[index] = ladder;
-}
-
-function disabledDate(date) {
-  return date.getTime() < new Date().getTime() - 86400000;
-}
-
-function handleDateChange(prop: string) {
-  const { arrtime, endtime } = formData.value;
-  const start = new Date(arrtime).valueOf();
-  const end = new Date(endtime).valueOf();
-  if (start > end) {
-    formData.value[prop] = "";
-    ElMessage.warning(`竞价截止时间不能大于要求到货时间!`);
-  }
-}
-
-function handleCreate() {
-  basicFormRef.value.validate(isValid => {
-    if (!isValid) return;
-    const { ladder, ...rest } = unref(formData);
-    const transform = ladder => {
-      return {
-        ...(ladder.good_img ? { good_img: ladder.good_img } : {}),
-        ...{
-          budget_price: ladder.budget_price,
-          good_name: ladder.good_name,
-          good_type: ladder.good_type,
-          num: ladder.num
-        }
-      };
-    };
-
-    const params = {
-      ...rest,
-      ladder: ladder.map(transform)
-    };
-
-    emit("create", params);
-  });
-}
-
-watchEffect(() => {
-  const { readonly, data } = props;
-  if (readonly && !data) {
-    return;
-  }
-
-  formData.value = transform(formItems, data, config);
-});
-</script>
-
-<template>
-  <ElScrollbar>
-    <BasicForm
-      ref="basicFormRef"
-      v-bind="projectFormConfig"
-      :form-data="formData"
-      :rules="projectFormRules"
-      :disabled="readonly"
-      label-width="120px"
-    >
-      <template #platform>
-        <SearchTerrace v-model="formData.platform" placeholder="所属平台" />
-      </template>
-
-      <template #companyNo>
-        <SearchWorkCompany v-model="formData.companyNo" placeholder="销售方" />
-      </template>
-
-      <template #arrtime>
-        <ElDatePicker
-          v-model="formData.arrtime"
-          style="width: 100%"
-          :disabled-date="disabledDate"
-          @change="e => handleDateChange('arrtime')"
-          placeholder="竞价截止时间"
-        />
-      </template>
-
-      <template #endtime>
-        <ElDatePicker
-          v-model="formData.endtime"
-          style="width: 100%"
-          :disabled-date="disabledDate"
-          @change="e => handleDateChange('endtime')"
-          placeholder="竞价截止时间"
-        />
-      </template>
-
-      <template #khNo>
-        <Customer
-          v-model="formData.khNo"
-          :companyNo="formData.khNo"
-          placeholder="购买方"
-        />
-      </template>
-
-      <template #budget_total>
-        <AmountInput v-model="formData.budget_total" placeholder="项目总预算" />
-      </template>
-
-      <template #ladder>
-        <LadderTable
-          :readonly="readonly"
-          :ladder="formData.ladder"
-          @choose="() => ladderModalRef.onDisplay()"
-          @update="({ data, index }) => ladderModalRef.onDisplay(data, index)"
-          @delete="index => formData.ladder.splice(index, 1)"
-        />
-      </template>
-
-      <template #footer>
-        <div class="w-full flex justify-end" v-if="!readonly">
-          <ElButton type="primary" @click="handleCreate">保存</ElButton>
-        </div>
-      </template>
-    </BasicForm>
-
-    <LadderModal
-      ref="ladderModalRef"
-      @update="handleUpdate"
-      @push="handlePush"
-    />
-  </ElScrollbar>
-</template>