gxwebsoft/gxtyzx-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 流程类型筛选改从后端字典接口加载（保留静态兜底）

Browse Source
This commit is contained in:
weicw
2026-10-31 07:43:17 +08:00
parent 7ae4319102
commit 3f62712ecb
664 changed files with 12766 additions and 9498 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/shop/balanceChargeLog/components/balanceChargeLogEdit.vue
+13 -24
View File
@@ -20,11 +20,7 @@
"
>
<a-form-item label="" name="amount">
<a-input
allow-clear
placeholder="请输入"
v-model:value="form.amount"
/>
<a-input allow-clear placeholder="请输入" v-model:value="form.amount" />
</a-form-item>
<a-form-item label="" name="orderNo">
<a-input
@@ -34,11 +30,7 @@
/>
</a-form-item>
<a-form-item label="" name="isPaid">
<a-input
allow-clear
placeholder="请输入"
v-model:value="form.isPaid"
/>
<a-input allow-clear placeholder="请输入" v-model:value="form.isPaid" />
</a-form-item>
<a-form-item label="" name="paidNumber">
<a-input
@@ -48,11 +40,7 @@
/>
</a-form-item>
<a-form-item label="" name="userId">
<a-input
allow-clear
placeholder="请输入"
v-model:value="form.userId"
/>
<a-input allow-clear placeholder="请输入" v-model:value="form.userId" />
</a-form-item>
<a-form-item label="修改时间" name="updateTime">
<a-input
@@ -62,11 +50,7 @@
/>
</a-form-item>
<a-form-item label="" name="remark">
<a-input
allow-clear
placeholder="请输入"
v-model:value="form.remark"
/>
<a-input allow-clear placeholder="请输入" v-model:value="form.remark" />
</a-form-item>
</a-form>
</ele-modal>
@@ -76,7 +60,10 @@
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject, uuid } from 'ele-admin-pro';
import { addBalanceChargeLog, updateBalanceChargeLog } from '@/api/shop/balanceChargeLog';
import {
addBalanceChargeLog,
updateBalanceChargeLog
} from '@/api/shop/balanceChargeLog';
import { BalanceChargeLog } from '@/api/shop/balanceChargeLog/model';
import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
@@ -175,7 +162,9 @@
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updateBalanceChargeLog : addBalanceChargeLog;
const saveOrUpdate = isUpdate.value
? updateBalanceChargeLog
: addBalanceChargeLog;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
@@ -198,12 +187,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/brand/components/brandEdit.vue
+11 -13
View File
@@ -27,17 +27,15 @@
v-model:value="form.brandName"
/>
</a-form-item>
<a-form-item
label="图标"
name="image">
<SelectFile
:placeholder="`请选择图片`"
:limit="1"
:data="images"
@done="chooseImage"
@del="onDeleteItem"
/>
</a-form-item>
<a-form-item label="图标" name="image">
<SelectFile
:placeholder="`请选择图片`"
:limit="1"
:data="images"
@done="chooseImage"
@del="onDeleteItem"
/>
</a-form-item>
<a-form-item label="备注" name="comments">
<a-textarea
:rows="4"
@@ -181,12 +179,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/cart/components/cartEdit.vue
+2 -2
View File
@@ -230,12 +230,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/cart/index.vue
+13 -13
View File
@@ -105,73 +105,73 @@
dataIndex: 'id',
key: 'id',
align: 'center',
width: 90,
width: 90
},
{
title: '类型 0商城 1预定 ',
dataIndex: 'type',
key: 'type',
align: 'center',
align: 'center'
},
{
title: '商品ID',
dataIndex: 'goodsId',
key: 'goodsId',
align: 'center',
align: 'center'
},
{
title: '唯一标识',
dataIndex: 'code',
key: 'code',
align: 'center',
align: 'center'
},
{
title: '商品数量',
dataIndex: 'cartNum',
key: 'cartNum',
align: 'center',
align: 'center'
},
{
title: '0 = 未购买 1 = 已购买',
dataIndex: 'isPay',
key: 'isPay',
align: 'center',
align: 'center'
},
{
title: '是否为立即购买',
dataIndex: 'isNew',
key: 'isNew',
align: 'center',
align: 'center'
},
{
title: '拼团id',
dataIndex: 'combinationId',
key: 'combinationId',
align: 'center',
align: 'center'
},
{
title: '秒杀产品ID',
dataIndex: 'seckillId',
key: 'seckillId',
align: 'center',
align: 'center'
},
{
title: '砍价id',
dataIndex: 'bargainId',
key: 'bargainId',
align: 'center',
align: 'center'
},
{
title: '用户ID',
dataIndex: 'userId',
key: 'userId',
align: 'center',
align: 'center'
},
{
title: '是否删除, 0否, 1是',
dataIndex: 'deleted',
key: 'deleted',
align: 'center',
align: 'center'
},
{
title: '注册时间',
@@ -186,7 +186,7 @@
title: '修改时间',
dataIndex: 'updateTime',
key: 'updateTime',
align: 'center',
align: 'center'
},
{
title: '操作',
src/views/shop/count/components/countEdit.vue
+2 -2
View File
@@ -214,12 +214,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/count/index.vue
+10 -10
View File
@@ -105,61 +105,61 @@
dataIndex: 'id',
key: 'id',
align: 'center',
width: 90,
width: 90
},
{
title: '统计日期',
dataIndex: 'dateTime',
key: 'dateTime',
align: 'center',
align: 'center'
},
{
title: '总销售额',
dataIndex: 'totalPrice',
key: 'totalPrice',
align: 'center',
align: 'center'
},
{
title: '今日销售额',
dataIndex: 'todayPrice',
key: 'todayPrice',
align: 'center',
align: 'center'
},
{
title: '总会员数',
dataIndex: 'totalUsers',
key: 'totalUsers',
align: 'center',
align: 'center'
},
{
title: '今日新增',
dataIndex: 'todayUsers',
key: 'todayUsers',
align: 'center',
align: 'center'
},
{
title: '总订单笔数',
dataIndex: 'totalOrders',
key: 'totalOrders',
align: 'center',
align: 'center'
},
{
title: '今日订单笔数',
dataIndex: 'todayOrders',
key: 'todayOrders',
align: 'center',
align: 'center'
},
{
title: '备注',
dataIndex: 'comments',
key: 'comments',
align: 'center',
align: 'center'
},
{
title: '状态, 0正常, 1冻结',
dataIndex: 'status',
key: 'status',
align: 'center',
align: 'center'
},
{
title: '注册时间',
src/views/shop/dealerApply/components/dealerApplyEdit.vue
+9 -4
View File
@@ -61,7 +61,10 @@
v-model:value="form.applyTime"
/>
</a-form-item>
<a-form-item label="审核状态 (10待审核 20审核通过 30驳回)" name="applyStatus">
<a-form-item
label="审核状态 (10待审核 20审核通过 30驳回)"
name="applyStatus"
>
<a-input
allow-clear
placeholder="请输入审核状态 (10待审核 20审核通过 30驳回)"
@@ -199,7 +202,9 @@
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updateDealerApply : addDealerApply;
const saveOrUpdate = isUpdate.value
? updateDealerApply
: addDealerApply;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
@@ -222,12 +227,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/dealerCapital/components/dealerCapitalEdit.vue
+13 -5
View File
@@ -33,7 +33,10 @@
v-model:value="form.orderId"
/>
</a-form-item>
<a-form-item label="资金流动类型 (10佣金收入 20提现支出 30转账支出 40转账收入)" name="flowType">
<a-form-item
label="资金流动类型 (10佣金收入 20提现支出 30转账支出 40转账收入)"
name="flowType"
>
<a-input
allow-clear
placeholder="请输入资金流动类型 (10佣金收入 20提现支出 30转账支出 40转账收入)"
@@ -76,7 +79,10 @@
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject, uuid } from 'ele-admin-pro';
import { addDealerCapital, updateDealerCapital } from '@/api/shop/dealerCapital';
import {
addDealerCapital,
updateDealerCapital
} from '@/api/shop/dealerCapital';
import { DealerCapital } from '@/api/shop/dealerCapital/model';
import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
@@ -175,7 +181,9 @@
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updateDealerCapital : addDealerCapital;
const saveOrUpdate = isUpdate.value
? updateDealerCapital
: addDealerCapital;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
@@ -198,12 +206,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/dealerOrder/components/dealerOrderEdit.vue
+5 -3
View File
@@ -223,7 +223,9 @@
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updateDealerOrder : addDealerOrder;
const saveOrUpdate = isUpdate.value
? updateDealerOrder
: addDealerOrder;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
@@ -246,12 +248,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/dealerOrder/index.vue
+1 -1
View File
@@ -174,7 +174,7 @@
sorter: true,
ellipsis: true,
customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
},
}
// {
// title: '操作',
// key: 'action',
src/views/shop/dealerReferee/components/dealerRefereeEdit.vue
+9 -4
View File
@@ -55,7 +55,10 @@
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject, uuid } from 'ele-admin-pro';
import { addDealerReferee, updateDealerReferee } from '@/api/shop/dealerReferee';
import {
addDealerReferee,
updateDealerReferee
} from '@/api/shop/dealerReferee';
import { DealerReferee } from '@/api/shop/dealerReferee/model';
import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
@@ -151,7 +154,9 @@
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updateDealerReferee : addDealerReferee;
const saveOrUpdate = isUpdate.value
? updateDealerReferee
: addDealerReferee;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
@@ -174,12 +179,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/dealerSetting/components/dealerSettingEdit.vue
+9 -4
View File
@@ -48,7 +48,10 @@
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject, uuid } from 'ele-admin-pro';
import { addDealerSetting, updateDealerSetting } from '@/api/shop/dealerSetting';
import {
addDealerSetting,
updateDealerSetting
} from '@/api/shop/dealerSetting';
import { DealerSetting } from '@/api/shop/dealerSetting/model';
import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
@@ -142,7 +145,9 @@
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updateDealerSetting : addDealerSetting;
const saveOrUpdate = isUpdate.value
? updateDealerSetting
: addDealerSetting;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
@@ -165,12 +170,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/dealerUser/components/dealerUserEdit.vue
+2 -2
View File
@@ -239,12 +239,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/dealerWithdraw/components/dealerWithdrawEdit.vue
+13 -5
View File
@@ -75,7 +75,10 @@
v-model:value="form.bankCard"
/>
</a-form-item>
<a-form-item label="申请状态 (10待审核 20审核通过 30驳回 40已打款)" name="applyStatus">
<a-form-item
label="申请状态 (10待审核 20审核通过 30驳回 40已打款)"
name="applyStatus"
>
<a-input
allow-clear
placeholder="请输入申请状态 (10待审核 20审核通过 30驳回 40已打款)"
@@ -118,7 +121,10 @@
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject, uuid } from 'ele-admin-pro';
import { addDealerWithdraw, updateDealerWithdraw } from '@/api/shop/dealerWithdraw';
import {
addDealerWithdraw,
updateDealerWithdraw
} from '@/api/shop/dealerWithdraw';
import { DealerWithdraw } from '@/api/shop/dealerWithdraw/model';
import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
@@ -223,7 +229,9 @@
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updateDealerWithdraw : addDealerWithdraw;
const saveOrUpdate = isUpdate.value
? updateDealerWithdraw
: addDealerWithdraw;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
@@ -246,12 +254,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/demo/components/goodsEdit.vue
+48 -41
View File
@@ -20,18 +20,18 @@
"
>
<a-form-item label="广告位类型" name="adType">
<a-select
ref="select"
v-model:value="form.adType"
style="width: 120px"
>
<a-select ref="select" v-model:value="form.adType" style="width: 120px">
<a-select-option value="图片广告">图片广告</a-select-option>
<a-select-option value="幻灯片">幻灯片</a-select-option>
<a-select-option value="视频广告">视频广告</a-select-option>
</a-select>
</a-form-item>
<template v-if="form.adType == '幻灯片'">
<a-form-item label="广告图片" name="images" extra="请上传广告图片,最多可上传9张图">
<a-form-item
label="广告图片"
name="images"
extra="请上传广告图片,最多可上传9张图"
>
<SelectFile
:placeholder="`请选择图片`"
:limit="9"
@@ -39,15 +39,15 @@
@done="chooseFile"
@del="onDeleteItem"
/>
<!-- <ele-image-upload-->
<!-- v-model:value="images"-->
<!-- :limit="9"-->
<!-- :drag="true"-->
<!-- :accept="'image/png,image/jpeg'"-->
<!-- :item-style="{ maxWidth: '160px', maxHeight: '160px' }"-->
<!-- :upload-handler="uploadHandler"-->
<!-- @upload="onUpload"-->
<!-- />-->
<!-- <ele-image-upload-->
<!-- v-model:value="images"-->
<!-- :limit="9"-->
<!-- :drag="true"-->
<!-- :accept="'image/png,image/jpeg'"-->
<!-- :item-style="{ maxWidth: '160px', maxHeight: '160px' }"-->
<!-- :upload-handler="uploadHandler"-->
<!-- @upload="onUpload"-->
<!-- />-->
</a-form-item>
</template>
<template v-if="form.adType == '图片广告'">
@@ -59,19 +59,23 @@
@done="chooseFile"
@del="onDeleteItem"
/>
<!-- <ele-image-upload-->
<!-- v-model:value="images"-->
<!-- :limit="1"-->
<!-- :accept="'image/png,image/jpeg'"-->
<!-- :drag="true"-->
<!-- :item-style="{ maxWidth: '160px', maxHeight: '160px' }"-->
<!-- :upload-handler="uploadHandler"-->
<!-- @upload="onUpload"-->
<!-- />-->
<!-- <ele-image-upload-->
<!-- v-model:value="images"-->
<!-- :limit="1"-->
<!-- :accept="'image/png,image/jpeg'"-->
<!-- :drag="true"-->
<!-- :item-style="{ maxWidth: '160px', maxHeight: '160px' }"-->
<!-- :upload-handler="uploadHandler"-->
<!-- @upload="onUpload"-->
<!-- />-->
</a-form-item>
</template>
<template v-if="form.adType == '视频广告'">
<a-form-item label="上传视频" name="images" extra="请上传视频文件，仅支持mp4格式，大小200M以内">
<a-form-item
label="上传视频"
name="images"
extra="请上传视频文件，仅支持mp4格式，大小200M以内"
>
<SelectFile
:placeholder="`请选择视频文件`"
:limit="1"
@@ -79,15 +83,15 @@
@done="chooseFile"
@del="onDeleteItem"
/>
<!-- <ele-image-upload-->
<!-- v-model:value="images"-->
<!-- :limit="1"-->
<!-- :accept="'video/mp4'"-->
<!-- :drag="true"-->
<!-- :item-style="{ maxWidth: '160px', maxHeight: '160px' }"-->
<!-- :upload-handler="uploadHandler"-->
<!-- @upload="onUpload"-->
<!-- />-->
<!-- <ele-image-upload-->
<!-- v-model:value="images"-->
<!-- :limit="1"-->
<!-- :accept="'video/mp4'"-->
<!-- :drag="true"-->
<!-- :item-style="{ maxWidth: '160px', maxHeight: '160px' }"-->
<!-- :upload-handler="uploadHandler"-->
<!-- @upload="onUpload"-->
<!-- />-->
</a-form-item>
</template>
<a-form-item label="广告位名称" name="name">
@@ -136,15 +140,15 @@
<script lang="ts" setup>
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import {assignObject, isChinese} from 'ele-admin-pro';
import { assignObject, isChinese } from 'ele-admin-pro';
import { addAd, updateAd } from '@/api/cms/ad';
import { Ad } from '@/api/cms/ad/model';
import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
import {FormInstance, RuleObject} from 'ant-design-vue/es/form';
import { FormInstance, RuleObject } from 'ant-design-vue/es/form';
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import { uploadFile } from '@/api/system/file';
import {FileRecord} from "@/api/system/file/model";
import { FileRecord } from '@/api/system/file/model';
// 是否是修改
const isUpdate = ref(false);
@@ -260,7 +264,10 @@
.then((data) => {
images.value.push({
uid: data.id,
url: file.type == 'video/mp4' ? 'https://oss.wsdns.cn/20240301/6e4e32cb808245d4be336b9486961145.png' : data.path,
url:
file.type == 'video/mp4'
? 'https://oss.wsdns.cn/20240301/6e4e32cb808245d4be336b9486961145.png'
: data.path,
status: 'done'
});
})
@@ -276,12 +283,12 @@
status: 'done'
});
form.images = data.path;
}
};
const onDeleteItem = (index: number) => {
images.value.splice(index,1)
images.value.splice(index, 1);
form.images = '';
}
};
/* 保存编辑 */
const save = () => {
src/views/shop/goods/index.vue
+8 -3
View File
@@ -97,8 +97,13 @@
import router from '@/router';
import { openSpmUrl, openUrl } from '@/utils/common';
import { getMerchantId } from '@/utils/merchant';
import { pageThinkGoods, removeBatchThinkGoods, removeThinkGoods, updateThinkGoods } from "@/api/think/thinkGoods";
import dayjs from "dayjs";
import {
pageThinkGoods,
removeBatchThinkGoods,
removeThinkGoods,
updateThinkGoods
} from '@/api/think/thinkGoods';
import dayjs from 'dayjs';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -180,7 +185,7 @@
align: 'center',
width: 120,
sorter: true,
customRender: ({text}) => dayjs(text * 1000).format('YYYY-MM-DD HH:mm')
customRender: ({ text }) => dayjs(text * 1000).format('YYYY-MM-DD HH:mm')
},
{
title: '操作',
src/views/shop/goodsCategory/components/category-edit.vue
+1 -1
View File
@@ -111,7 +111,7 @@
} from '@/api/shop/goodsCategory';
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import { FileRecord } from '@/api/system/file/model';
import { getMerchantId } from "@/utils/merchant";
import { getMerchantId } from '@/utils/merchant';
// 是否开启响应式布局
const themeStore = useThemeStore();
src/views/shop/goodsCategory/components/merchant-category-edit.vue
+1 -1
View File
@@ -100,7 +100,7 @@
} from '@/api/shop/goodsCategory';
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import { FileRecord } from '@/api/system/file/model';
import { getMerchantId } from "@/utils/merchant";
import { getMerchantId } from '@/utils/merchant';
// 是否开启响应式布局
const themeStore = useThemeStore();
src/views/shop/goodsCategory/index.vue
+1 -1
View File
@@ -157,7 +157,7 @@
import router from '@/router';
import Search from './components/search.vue';
import { getSiteDomain } from '@/utils/domain';
import { getMerchantId } from "@/utils/merchant";
import { getMerchantId } from '@/utils/merchant';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
src/views/shop/goodsSku/components/goodsSkuEdit.vue
+15 -14
View File
@@ -26,24 +26,25 @@
v-model:value="form.goodsId"
/>
</a-form-item>
<a-form-item label="商品属性索引值 (attr_value|attr_value[|....])" name="sku">
<a-form-item
label="商品属性索引值 (attr_value|attr_value[|....])"
name="sku"
>
<a-input
allow-clear
placeholder="请输入商品属性索引值 (attr_value|attr_value[|....])"
v-model:value="form.sku"
/>
</a-form-item>
<a-form-item
label="商品图片"
name="image">
<SelectFile
:placeholder="`请选择图片`"
:limit="1"
:data="images"
@done="chooseImage"
@del="onDeleteItem"
/>
</a-form-item>
<a-form-item label="商品图片" name="image">
<SelectFile
:placeholder="`请选择图片`"
:limit="1"
:data="images"
@done="chooseImage"
@del="onDeleteItem"
/>
</a-form-item>
<a-form-item label="商品价格" name="price">
<a-input
allow-clear
@@ -250,12 +251,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/order/components/orderInfo.vue
+1 -1
View File
@@ -175,7 +175,7 @@
} from '@ant-design/icons-vue';
import { pageOrderInfo } from '@/api/shop/orderInfo';
import { pageOrderGoods } from '@/api/shop/orderGoods';
import record from "@/views/cms/design/record/index.vue";
import record from '@/views/cms/design/record/index.vue';
const useForm = Form.useForm;
src/views/shop/order/components/search.vue
+1 -1
View File
@@ -76,7 +76,7 @@
import { Merchant } from '@/api/shop/merchant/model';
import { listOrder } from '@/api/shop/order';
import { Order, OrderParam } from '@/api/shop/order/model';
import { getMerchantId } from "@/utils/merchant";
import { getMerchantId } from '@/utils/merchant';
const props = withDefaults(
defineProps<{
src/views/shop/order/index.vue
+1 -1
View File
@@ -219,7 +219,7 @@
<!-- 编辑弹窗 -->
<OrderInfo v-model:visible="showEdit" :data="current" @done="reload" />
<!-- 发货弹窗 -->
<!-- <Delivery v-model:visible="showDelivery" :data="current" @done="reload" />-->
<!-- <Delivery v-model:visible="showDelivery" :data="current" @done="reload" />-->
</div>
</div>
</template>
src/views/shop/orderInfo/components/orderInfoEdit.vue
+6 -3
View File
@@ -89,7 +89,10 @@
v-model:value="form.childrenNum"
/>
</a-form-item>
<a-form-item label="1已付款，2未付款，3无需付款或占用状态" name="payStatus">
<a-form-item
label="1已付款，2未付款，3无需付款或占用状态"
name="payStatus"
>
<a-input
allow-clear
placeholder="请输入1已付款，2未付款，3无需付款或占用状态"
@@ -281,12 +284,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/orderInfo/index.vue
+29 -21
View File
@@ -45,7 +45,11 @@
</a-card>
<!-- 编辑弹窗 -->
<OrderInfoEdit v-model:visible="showEdit" :data="current" @done="reload" />
<OrderInfoEdit
v-model:visible="showEdit"
:data="current"
@done="reload"
/>
</div>
</div>
</template>
@@ -62,7 +66,11 @@
} from 'ele-admin-pro/es/ele-pro-table/types';
import Search from './components/search.vue';
import OrderInfoEdit from './components/orderInfoEdit.vue';
import { pageOrderInfo, removeOrderInfo, removeBatchOrderInfo } from '@/api/shop/orderInfo';
import {
pageOrderInfo,
removeOrderInfo,
removeBatchOrderInfo
} from '@/api/shop/orderInfo';
import type { OrderInfo, OrderInfoParam } from '@/api/shop/orderInfo/model';
// 表格实例
@@ -105,115 +113,115 @@
dataIndex: 'id',
key: 'id',
align: 'center',
width: 90,
width: 90
},
{
title: '关联订单表id',
dataIndex: 'oid',
key: 'oid',
align: 'center',
align: 'center'
},
{
title: '关联场馆id',
dataIndex: 'sid',
key: 'sid',
align: 'center',
align: 'center'
},
{
title: '关联场地id',
dataIndex: 'fid',
key: 'fid',
align: 'center',
align: 'center'
},
{
title: '场馆',
dataIndex: 'siteName',
key: 'siteName',
align: 'center',
align: 'center'
},
{
title: '场地',
dataIndex: 'fieldName',
key: 'fieldName',
align: 'center',
align: 'center'
},
{
title: '预约时间段',
dataIndex: 'dateTime',
key: 'dateTime',
align: 'center',
align: 'center'
},
{
title: '单价',
dataIndex: 'price',
key: 'price',
align: 'center',
align: 'center'
},
{
title: '儿童价',
dataIndex: 'childrenPrice',
key: 'childrenPrice',
align: 'center',
align: 'center'
},
{
title: '成人人数',
dataIndex: 'adultNum',
key: 'adultNum',
align: 'center',
align: 'center'
},
{
title: '儿童人数',
dataIndex: 'childrenNum',
key: 'childrenNum',
align: 'center',
align: 'center'
},
{
title: '1已付款，2未付款，3无需付款或占用状态',
dataIndex: 'payStatus',
key: 'payStatus',
align: 'center',
align: 'center'
},
{
title: '是否免费：1免费、2收费',
dataIndex: 'isFree',
key: 'isFree',
align: 'center',
align: 'center'
},
{
title: '是否支持儿童票：1支持，2不支持',
dataIndex: 'isChildren',
key: 'isChildren',
align: 'center',
align: 'center'
},
{
title: '预订类型：1全场，2半场',
dataIndex: 'type',
key: 'type',
align: 'center',
align: 'center'
},
{
title: '组合数据:日期+时间段+场馆id+场地id',
dataIndex: 'mergeData',
key: 'mergeData',
align: 'center',
align: 'center'
},
{
title: '开场时间',
dataIndex: 'startTime',
key: 'startTime',
align: 'center',
align: 'center'
},
{
title: '下单时间',
dataIndex: 'orderTime',
key: 'orderTime',
align: 'center',
align: 'center'
},
{
title: '毫秒时间戳',
dataIndex: 'timeFlag',
key: 'timeFlag',
align: 'center',
align: 'center'
},
{
title: '创建时间',
src/views/shop/rechargeOrder/components/rechargeOrderEdit.vue
+13 -5
View File
@@ -33,7 +33,10 @@
v-model:value="form.userId"
/>
</a-form-item>
<a-form-item label="充值方式(10自定义金额 20套餐充值)" name="rechargeType">
<a-form-item
label="充值方式(10自定义金额 20套餐充值)"
name="rechargeType"
>
<a-input
allow-clear
placeholder="请输入充值方式(10自定义金额 20套餐充值)"
@@ -176,7 +179,10 @@
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject, uuid } from 'ele-admin-pro';
import { addRechargeOrder, updateRechargeOrder } from '@/api/shop/rechargeOrder';
import {
addRechargeOrder,
updateRechargeOrder
} from '@/api/shop/rechargeOrder';
import { RechargeOrder } from '@/api/shop/rechargeOrder/model';
import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
@@ -289,7 +295,9 @@
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updateRechargeOrder : addRechargeOrder;
const saveOrUpdate = isUpdate.value
? updateRechargeOrder
: addRechargeOrder;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
@@ -312,12 +320,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/rechargeOrder/index.vue
+36 -25
View File
@@ -45,7 +45,11 @@
</a-card>
<!-- 编辑弹窗 -->
<RechargeOrderEdit v-model:visible="showEdit" :data="current" @done="reload" />
<RechargeOrderEdit
v-model:visible="showEdit"
:data="current"
@done="reload"
/>
</div>
</div>
</template>
@@ -62,8 +66,15 @@
} from 'ele-admin-pro/es/ele-pro-table/types';
import Search from './components/search.vue';
import RechargeOrderEdit from './components/rechargeOrderEdit.vue';
import { pageRechargeOrder, removeRechargeOrder, removeBatchRechargeOrder } from '@/api/shop/rechargeOrder';
import type { RechargeOrder, RechargeOrderParam } from '@/api/shop/rechargeOrder/model';
import {
pageRechargeOrder,
removeRechargeOrder,
removeBatchRechargeOrder
} from '@/api/shop/rechargeOrder';
import type {
RechargeOrder,
RechargeOrderParam
} from '@/api/shop/rechargeOrder/model';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -105,127 +116,127 @@
dataIndex: 'orderId',
key: 'orderId',
align: 'center',
width: 90,
width: 90
},
{
title: '订单号',
dataIndex: 'orderNo',
key: 'orderNo',
align: 'center',
align: 'center'
},
{
title: '用户ID',
dataIndex: 'userId',
key: 'userId',
align: 'center',
align: 'center'
},
{
title: '充值方式(10自定义金额 20套餐充值)',
dataIndex: 'rechargeType',
key: 'rechargeType',
align: 'center',
align: 'center'
},
{
title: '机构id',
dataIndex: 'organizationId',
key: 'organizationId',
align: 'center',
align: 'center'
},
{
title: '充值套餐ID',
dataIndex: 'planId',
key: 'planId',
align: 'center',
align: 'center'
},
{
title: '用户支付金额',
dataIndex: 'payPrice',
key: 'payPrice',
align: 'center',
align: 'center'
},
{
title: '赠送金额',
dataIndex: 'giftMoney',
key: 'giftMoney',
align: 'center',
align: 'center'
},
{
title: '实际到账金额',
dataIndex: 'actualMoney',
key: 'actualMoney',
align: 'center',
align: 'center'
},
{
title: '用户可用余额',
dataIndex: 'balance',
key: 'balance',
align: 'center',
align: 'center'
},
{
title: '支付方式（微信/支付宝）',
dataIndex: 'payMethod',
key: 'payMethod',
align: 'center',
align: 'center'
},
{
title: '支付状态(10待支付 20已支付)',
dataIndex: 'payStatus',
key: 'payStatus',
align: 'center',
align: 'center'
},
{
title: '付款时间',
dataIndex: 'payTime',
key: 'payTime',
align: 'center',
align: 'center'
},
{
title: '第三方交易记录ID',
dataIndex: 'tradeId',
key: 'tradeId',
align: 'center',
align: 'center'
},
{
title: '来源客户端 (APP、H5、小程序等)',
dataIndex: 'platform',
key: 'platform',
align: 'center',
align: 'center'
},
{
title: '所属门店ID',
dataIndex: 'shopId',
key: 'shopId',
align: 'center',
align: 'center'
},
{
title: '排序(数字越小越靠前)',
dataIndex: 'sortNumber',
key: 'sortNumber',
align: 'center',
align: 'center'
},
{
title: '备注',
dataIndex: 'comments',
key: 'comments',
align: 'center',
align: 'center'
},
{
title: '状态, 0正常, 1冻结',
dataIndex: 'status',
key: 'status',
align: 'center',
align: 'center'
},
{
title: '是否删除, 0否, 1是',
dataIndex: 'deleted',
key: 'deleted',
align: 'center',
align: 'center'
},
{
title: '商户编码',
dataIndex: 'merchantCode',
key: 'merchantCode',
align: 'center',
align: 'center'
},
{
title: '注册时间',
@@ -240,7 +251,7 @@
title: '修改时间',
dataIndex: 'updateTime',
key: 'updateTime',
align: 'center',
align: 'center'
},
{
title: '操作',
src/views/shop/shopMerchant/components/shopMerchantEdit.vue
+16 -24
View File
@@ -40,17 +40,15 @@
v-model:value="form.type"
/>
</a-form-item>
<a-form-item
label="商户图标"
name="image">
<SelectFile
:placeholder="`请选择图片`"
:limit="1"
:data="images"
@done="chooseImage"
@del="onDeleteItem"
/>
</a-form-item>
<a-form-item label="商户图标" name="image">
<SelectFile
:placeholder="`请选择图片`"
:limit="1"
:data="images"
@done="chooseImage"
@del="onDeleteItem"
/>
</a-form-item>
<a-form-item label="商户手机号" name="phone">
<a-input
allow-clear
@@ -108,18 +106,10 @@
/>
</a-form-item>
<a-form-item label="" name="lng">
<a-input
allow-clear
placeholder="请输入"
v-model:value="form.lng"
/>
<a-input allow-clear placeholder="请输入" v-model:value="form.lng" />
</a-form-item>
<a-form-item label="" name="lat">
<a-input
allow-clear
placeholder="请输入"
v-model:value="form.lat"
/>
<a-input allow-clear placeholder="请输入" v-model:value="form.lat" />
</a-form-item>
<a-form-item label="所在省份" name="province">
<a-input
@@ -384,7 +374,9 @@
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updateShopMerchant : addShopMerchant;
const saveOrUpdate = isUpdate.value
? updateShopMerchant
: addShopMerchant;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
@@ -407,12 +399,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/shopMerchant/index.vue
+48 -37
View File
@@ -45,7 +45,11 @@
</a-card>
<!-- 编辑弹窗 -->
<ShopMerchantEdit v-model:visible="showEdit" :data="current" @done="reload" />
<ShopMerchantEdit
v-model:visible="showEdit"
:data="current"
@done="reload"
/>
</div>
</div>
</template>
@@ -62,8 +66,15 @@
} from 'ele-admin-pro/es/ele-pro-table/types';
import Search from './components/search.vue';
import ShopMerchantEdit from './components/shopMerchantEdit.vue';
import { pageShopMerchant, removeShopMerchant, removeBatchShopMerchant } from '@/api/shop/shopMerchant';
import type { ShopMerchant, ShopMerchantParam } from '@/api/shop/shopMerchant/model';
import {
pageShopMerchant,
removeShopMerchant,
removeBatchShopMerchant
} from '@/api/shop/shopMerchant';
import type {
ShopMerchant,
ShopMerchantParam
} from '@/api/shop/shopMerchant/model';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -105,205 +116,205 @@
dataIndex: 'merchantId',
key: 'merchantId',
align: 'center',
width: 90,
width: 90
},
{
title: '商户名称',
dataIndex: 'merchantName',
key: 'merchantName',
align: 'center',
align: 'center'
},
{
title: '商户编号',
dataIndex: 'merchantCode',
key: 'merchantCode',
align: 'center',
align: 'center'
},
{
title: '商户类型',
dataIndex: 'type',
key: 'type',
align: 'center',
align: 'center'
},
{
title: '商户图标',
dataIndex: 'image',
key: 'image',
align: 'center',
align: 'center'
},
{
title: '商户手机号',
dataIndex: 'phone',
key: 'phone',
align: 'center',
align: 'center'
},
{
title: '商户姓名',
dataIndex: 'realName',
key: 'realName',
align: 'center',
align: 'center'
},
{
title: '店铺类型',
dataIndex: 'shopType',
key: 'shopType',
align: 'center',
align: 'center'
},
{
title: '项目分类',
dataIndex: 'itemType',
key: 'itemType',
align: 'center',
align: 'center'
},
{
title: '商户分类',
dataIndex: 'category',
key: 'category',
align: 'center',
align: 'center'
},
{
title: '商户经营分类',
dataIndex: 'merchantCategoryId',
key: 'merchantCategoryId',
align: 'center',
align: 'center'
},
{
title: '商户分类',
dataIndex: 'merchantCategoryTitle',
key: 'merchantCategoryTitle',
align: 'center',
align: 'center'
},
{
title: '经纬度',
dataIndex: 'lngAndLat',
key: 'lngAndLat',
align: 'center',
align: 'center'
},
{
title: '',
dataIndex: 'lng',
key: 'lng',
align: 'center',
align: 'center'
},
{
title: '',
dataIndex: 'lat',
key: 'lat',
align: 'center',
align: 'center'
},
{
title: '所在省份',
dataIndex: 'province',
key: 'province',
align: 'center',
align: 'center'
},
{
title: '所在城市',
dataIndex: 'city',
key: 'city',
align: 'center',
align: 'center'
},
{
title: '所在辖区',
dataIndex: 'region',
key: 'region',
align: 'center',
align: 'center'
},
{
title: '详细地址',
dataIndex: 'address',
key: 'address',
align: 'center',
align: 'center'
},
{
title: '手续费',
dataIndex: 'commission',
key: 'commission',
align: 'center',
align: 'center'
},
{
title: '关键字',
dataIndex: 'keywords',
key: 'keywords',
align: 'center',
align: 'center'
},
{
title: '资质图片',
dataIndex: 'files',
key: 'files',
align: 'center',
align: 'center'
},
{
title: '营业时间',
dataIndex: 'businessTime',
key: 'businessTime',
align: 'center',
align: 'center'
},
{
title: '文章内容',
dataIndex: 'content',
key: 'content',
align: 'center',
align: 'center'
},
{
title: '每小时价格',
dataIndex: 'price',
key: 'price',
align: 'center',
align: 'center'
},
{
title: '是否自营',
dataIndex: 'ownStore',
key: 'ownStore',
align: 'center',
align: 'center'
},
{
title: '是否推荐',
dataIndex: 'recommend',
key: 'recommend',
align: 'center',
align: 'center'
},
{
title: '是否需要审核',
dataIndex: 'goodsReview',
key: 'goodsReview',
align: 'center',
align: 'center'
},
{
title: '管理入口',
dataIndex: 'adminUrl',
key: 'adminUrl',
align: 'center',
align: 'center'
},
{
title: '备注',
dataIndex: 'comments',
key: 'comments',
align: 'center',
align: 'center'
},
{
title: '所有人',
dataIndex: 'userId',
key: 'userId',
align: 'center',
align: 'center'
},
{
title: '是否删除, 0否, 1是',
dataIndex: 'deleted',
key: 'deleted',
align: 'center',
align: 'center'
},
{
title: '状态',
dataIndex: 'status',
key: 'status',
align: 'center',
align: 'center'
},
{
title: '排序号',
dataIndex: 'sortNumber',
key: 'sortNumber',
align: 'center',
align: 'center'
},
{
title: '创建时间',
src/views/shop/shopMerchantAccount/components/shopMerchantAccountEdit.vue
+9 -4
View File
@@ -92,7 +92,10 @@
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject, uuid } from 'ele-admin-pro';
import { addShopMerchantAccount, updateShopMerchantAccount } from '@/api/shop/shopMerchantAccount';
import {
addShopMerchantAccount,
updateShopMerchantAccount
} from '@/api/shop/shopMerchantAccount';
import { ShopMerchantAccount } from '@/api/shop/shopMerchantAccount/model';
import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
@@ -193,7 +196,9 @@
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updateShopMerchantAccount : addShopMerchantAccount;
const saveOrUpdate = isUpdate.value
? updateShopMerchantAccount
: addShopMerchantAccount;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
@@ -216,12 +221,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/shopMerchantAccount/index.vue
+27 -14
View File
@@ -45,7 +45,11 @@
</a-card>
<!-- 编辑弹窗 -->
<ShopMerchantAccountEdit v-model:visible="showEdit" :data="current" @done="reload" />
<ShopMerchantAccountEdit
v-model:visible="showEdit"
:data="current"
@done="reload"
/>
</div>
</div>
</template>
@@ -62,8 +66,15 @@
} from 'ele-admin-pro/es/ele-pro-table/types';
import Search from './components/search.vue';
import ShopMerchantAccountEdit from './components/shopMerchantAccountEdit.vue';
import { pageShopMerchantAccount, removeShopMerchantAccount, removeBatchShopMerchantAccount } from '@/api/shop/shopMerchantAccount';
import type { ShopMerchantAccount, ShopMerchantAccountParam } from '@/api/shop/shopMerchantAccount/model';
import {
pageShopMerchantAccount,
removeShopMerchantAccount,
removeBatchShopMerchantAccount
} from '@/api/shop/shopMerchantAccount';
import type {
ShopMerchantAccount,
ShopMerchantAccountParam
} from '@/api/shop/shopMerchantAccount/model';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -105,61 +116,61 @@
dataIndex: 'id',
key: 'id',
align: 'center',
width: 90,
width: 90
},
{
title: '商户手机号',
dataIndex: 'phone',
key: 'phone',
align: 'center',
align: 'center'
},
{
title: '真实姓名',
dataIndex: 'realName',
key: 'realName',
align: 'center',
align: 'center'
},
{
title: '商户ID',
dataIndex: 'merchantId',
key: 'merchantId',
align: 'center',
align: 'center'
},
{
title: '角色ID',
dataIndex: 'roleId',
key: 'roleId',
align: 'center',
align: 'center'
},
{
title: '角色名称',
dataIndex: 'roleName',
key: 'roleName',
align: 'center',
align: 'center'
},
{
title: '用户ID',
dataIndex: 'userId',
key: 'userId',
align: 'center',
align: 'center'
},
{
title: '备注',
dataIndex: 'comments',
key: 'comments',
align: 'center',
align: 'center'
},
{
title: '状态',
dataIndex: 'status',
key: 'status',
align: 'center',
align: 'center'
},
{
title: '排序号',
dataIndex: 'sortNumber',
key: 'sortNumber',
align: 'center',
align: 'center'
},
{
title: '创建时间',
@@ -225,7 +236,9 @@
maskClosable: true,
onOk: () => {
const hide = message.loading('请求中..', 0);
removeBatchShopMerchantAccount(selection.value.map((d) => d.shopMerchantAccountId))
removeBatchShopMerchantAccount(
selection.value.map((d) => d.shopMerchantAccountId)
)
.then((msg) => {
hide();
message.success(msg);
src/views/shop/shopMerchantApply/components/shopMerchantApplyEdit.vue
+18 -15
View File
@@ -26,17 +26,15 @@
v-model:value="form.merchantName"
/>
</a-form-item>
<a-form-item
label="商户图标"
name="image">
<SelectFile
:placeholder="`请选择图片`"
:limit="1"
:data="images"
@done="chooseImage"
@del="onDeleteItem"
/>
</a-form-item>
<a-form-item label="商户图标" name="image">
<SelectFile
:placeholder="`请选择图片`"
:limit="1"
:data="images"
@done="chooseImage"
@del="onDeleteItem"
/>
</a-form-item>
<a-form-item label="商户手机号" name="phone">
<a-input
allow-clear
@@ -166,7 +164,10 @@
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject, uuid } from 'ele-admin-pro';
import { addShopMerchantApply, updateShopMerchantApply } from '@/api/shop/shopMerchantApply';
import {
addShopMerchantApply,
updateShopMerchantApply
} from '@/api/shop/shopMerchantApply';
import { ShopMerchantApply } from '@/api/shop/shopMerchantApply/model';
import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
@@ -277,7 +278,9 @@
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updateShopMerchantApply : addShopMerchantApply;
const saveOrUpdate = isUpdate.value
? updateShopMerchantApply
: addShopMerchantApply;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
@@ -300,12 +303,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/shopMerchantApply/index.vue
+37 -24
View File
@@ -45,7 +45,11 @@
</a-card>
<!-- 编辑弹窗 -->
<ShopMerchantApplyEdit v-model:visible="showEdit" :data="current" @done="reload" />
<ShopMerchantApplyEdit
v-model:visible="showEdit"
:data="current"
@done="reload"
/>
</div>
</div>
</template>
@@ -62,8 +66,15 @@
} from 'ele-admin-pro/es/ele-pro-table/types';
import Search from './components/search.vue';
import ShopMerchantApplyEdit from './components/shopMerchantApplyEdit.vue';
import { pageShopMerchantApply, removeShopMerchantApply, removeBatchShopMerchantApply } from '@/api/shop/shopMerchantApply';
import type { ShopMerchantApply, ShopMerchantApplyParam } from '@/api/shop/shopMerchantApply/model';
import {
pageShopMerchantApply,
removeShopMerchantApply,
removeBatchShopMerchantApply
} from '@/api/shop/shopMerchantApply';
import type {
ShopMerchantApply,
ShopMerchantApplyParam
} from '@/api/shop/shopMerchantApply/model';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -105,121 +116,121 @@
dataIndex: 'applyId',
key: 'applyId',
align: 'center',
width: 90,
width: 90
},
{
title: '商户名称',
dataIndex: 'merchantName',
key: 'merchantName',
align: 'center',
align: 'center'
},
{
title: '商户图标',
dataIndex: 'image',
key: 'image',
align: 'center',
align: 'center'
},
{
title: '商户手机号',
dataIndex: 'phone',
key: 'phone',
align: 'center',
align: 'center'
},
{
title: '商户姓名',
dataIndex: 'realName',
key: 'realName',
align: 'center',
align: 'center'
},
{
title: '身份证号码',
dataIndex: 'idCard',
key: 'idCard',
align: 'center',
align: 'center'
},
{
title: '店铺类型',
dataIndex: 'shopType',
key: 'shopType',
align: 'center',
align: 'center'
},
{
title: '商户分类',
dataIndex: 'category',
key: 'category',
align: 'center',
align: 'center'
},
{
title: '手续费',
dataIndex: 'commission',
key: 'commission',
align: 'center',
align: 'center'
},
{
title: '关键字',
dataIndex: 'keywords',
key: 'keywords',
align: 'center',
align: 'center'
},
{
title: '资质图片',
dataIndex: 'files',
key: 'files',
align: 'center',
align: 'center'
},
{
title: '所有人',
dataIndex: 'userId',
key: 'userId',
align: 'center',
align: 'center'
},
{
title: '是否自营',
dataIndex: 'ownStore',
key: 'ownStore',
align: 'center',
align: 'center'
},
{
title: '是否推荐',
dataIndex: 'recommend',
key: 'recommend',
align: 'center',
align: 'center'
},
{
title: '是否需要审核',
dataIndex: 'goodsReview',
key: 'goodsReview',
align: 'center',
align: 'center'
},
{
title: '工作负责人',
dataIndex: 'name2',
key: 'name2',
align: 'center',
align: 'center'
},
{
title: '驳回原因',
dataIndex: 'reason',
key: 'reason',
align: 'center',
align: 'center'
},
{
title: '备注',
dataIndex: 'comments',
key: 'comments',
align: 'center',
align: 'center'
},
{
title: '状态',
dataIndex: 'status',
key: 'status',
align: 'center',
align: 'center'
},
{
title: '排序号',
dataIndex: 'sortNumber',
key: 'sortNumber',
align: 'center',
align: 'center'
},
{
title: '创建时间',
@@ -285,7 +296,9 @@
maskClosable: true,
onOk: () => {
const hide = message.loading('请求中..', 0);
removeBatchShopMerchantApply(selection.value.map((d) => d.shopMerchantApplyId))
removeBatchShopMerchantApply(
selection.value.map((d) => d.shopMerchantApplyId)
)
.then((msg) => {
hide();
message.success(msg);
src/views/shop/shopMerchantCount/components/shopMerchantCountEdit.vue
+9 -4
View File
@@ -57,7 +57,10 @@
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject, uuid } from 'ele-admin-pro';
import { addShopMerchantCount, updateShopMerchantCount } from '@/api/shop/shopMerchantCount';
import {
addShopMerchantCount,
updateShopMerchantCount
} from '@/api/shop/shopMerchantCount';
import { ShopMerchantCount } from '@/api/shop/shopMerchantCount/model';
import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
@@ -153,7 +156,9 @@
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updateShopMerchantCount : addShopMerchantCount;
const saveOrUpdate = isUpdate.value
? updateShopMerchantCount
: addShopMerchantCount;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
@@ -176,12 +181,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/shopMerchantCount/index.vue
+22 -9
View File
@@ -45,7 +45,11 @@
</a-card>
<!-- 编辑弹窗 -->
<ShopMerchantCountEdit v-model:visible="showEdit" :data="current" @done="reload" />
<ShopMerchantCountEdit
v-model:visible="showEdit"
:data="current"
@done="reload"
/>
</div>
</div>
</template>
@@ -62,8 +66,15 @@
} from 'ele-admin-pro/es/ele-pro-table/types';
import Search from './components/search.vue';
import ShopMerchantCountEdit from './components/shopMerchantCountEdit.vue';
import { pageShopMerchantCount, removeShopMerchantCount, removeBatchShopMerchantCount } from '@/api/shop/shopMerchantCount';
import type { ShopMerchantCount, ShopMerchantCountParam } from '@/api/shop/shopMerchantCount/model';
import {
pageShopMerchantCount,
removeShopMerchantCount,
removeBatchShopMerchantCount
} from '@/api/shop/shopMerchantCount';
import type {
ShopMerchantCount,
ShopMerchantCountParam
} from '@/api/shop/shopMerchantCount/model';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -105,31 +116,31 @@
dataIndex: 'id',
key: 'id',
align: 'center',
width: 90,
width: 90
},
{
title: '店铺名称',
dataIndex: 'name',
key: 'name',
align: 'center',
align: 'center'
},
{
title: '店铺说明',
dataIndex: 'comments',
key: 'comments',
align: 'center',
align: 'center'
},
{
title: '状态',
dataIndex: 'status',
key: 'status',
align: 'center',
align: 'center'
},
{
title: '排序号',
dataIndex: 'sortNumber',
key: 'sortNumber',
align: 'center',
align: 'center'
},
{
title: '创建时间',
@@ -195,7 +206,9 @@
maskClosable: true,
onOk: () => {
const hide = message.loading('请求中..', 0);
removeBatchShopMerchantCount(selection.value.map((d) => d.shopMerchantCountId))
removeBatchShopMerchantCount(
selection.value.map((d) => d.shopMerchantCountId)
)
.then((msg) => {
hide();
message.success(msg);
src/views/shop/shopMerchantType/components/shopMerchantTypeEdit.vue
+9 -4
View File
@@ -57,7 +57,10 @@
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject, uuid } from 'ele-admin-pro';
import { addShopMerchantType, updateShopMerchantType } from '@/api/shop/shopMerchantType';
import {
addShopMerchantType,
updateShopMerchantType
} from '@/api/shop/shopMerchantType';
import { ShopMerchantType } from '@/api/shop/shopMerchantType/model';
import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
@@ -153,7 +156,9 @@
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updateShopMerchantType : addShopMerchantType;
const saveOrUpdate = isUpdate.value
? updateShopMerchantType
: addShopMerchantType;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
@@ -176,12 +181,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/shopMerchantType/index.vue
+22 -9
View File
@@ -45,7 +45,11 @@
</a-card>
<!-- 编辑弹窗 -->
<ShopMerchantTypeEdit v-model:visible="showEdit" :data="current" @done="reload" />
<ShopMerchantTypeEdit
v-model:visible="showEdit"
:data="current"
@done="reload"
/>
</div>
</div>
</template>
@@ -62,8 +66,15 @@
} from 'ele-admin-pro/es/ele-pro-table/types';
import Search from './components/search.vue';
import ShopMerchantTypeEdit from './components/shopMerchantTypeEdit.vue';
import { pageShopMerchantType, removeShopMerchantType, removeBatchShopMerchantType } from '@/api/shop/shopMerchantType';
import type { ShopMerchantType, ShopMerchantTypeParam } from '@/api/shop/shopMerchantType/model';
import {
pageShopMerchantType,
removeShopMerchantType,
removeBatchShopMerchantType
} from '@/api/shop/shopMerchantType';
import type {
ShopMerchantType,
ShopMerchantTypeParam
} from '@/api/shop/shopMerchantType/model';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -105,31 +116,31 @@
dataIndex: 'id',
key: 'id',
align: 'center',
width: 90,
width: 90
},
{
title: '店铺类型',
dataIndex: 'name',
key: 'name',
align: 'center',
align: 'center'
},
{
title: '店铺入驻条件',
dataIndex: 'comments',
key: 'comments',
align: 'center',
align: 'center'
},
{
title: '状态',
dataIndex: 'status',
key: 'status',
align: 'center',
align: 'center'
},
{
title: '排序号',
dataIndex: 'sortNumber',
key: 'sortNumber',
align: 'center',
align: 'center'
},
{
title: '创建时间',
@@ -195,7 +206,9 @@
maskClosable: true,
onOk: () => {
const hide = message.loading('请求中..', 0);
removeBatchShopMerchantType(selection.value.map((d) => d.shopMerchantTypeId))
removeBatchShopMerchantType(
selection.value.map((d) => d.shopMerchantTypeId)
)
.then((msg) => {
hide();
message.success(msg);
src/views/shop/userBalanceLog/components/search.vue
+6 -6
View File
@@ -1,12 +1,12 @@
<!-- 搜索表单 -->
<template>
<a-space :size="10" style="flex-wrap: wrap">
<!-- <a-button type="primary" class="ele-btn-icon" @click="add">-->
<!-- <template #icon>-->
<!-- <PlusOutlined />-->
<!-- </template>-->
<!-- <span>添加</span>-->
<!-- </a-button>-->
<!-- <a-button type="primary" class="ele-btn-icon" @click="add">-->
<!-- <template #icon>-->
<!-- <PlusOutlined />-->
<!-- </template>-->
<!-- <span>添加</span>-->
<!-- </a-button>-->
</a-space>
</template>
src/views/shop/userBalanceLog/components/userBalanceLogEdit.vue
+13 -5
View File
@@ -26,7 +26,10 @@
v-model:value="form.userId"
/>
</a-form-item>
<a-form-item label="余额变动场景(0 用户充值 1用户消费 2管理员操作 3订单退款)" name="scene">
<a-form-item
label="余额变动场景(0 用户充值 1用户消费 2管理员操作 3订单退款)"
name="scene"
>
<a-input
allow-clear
placeholder="请输入余额变动场景(0 用户充值 1用户消费 2管理员操作 3订单退款)"
@@ -113,7 +116,10 @@
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject, uuid } from 'ele-admin-pro';
import { addUserBalanceLog, updateUserBalanceLog } from '@/api/shop/userBalanceLog';
import {
addUserBalanceLog,
updateUserBalanceLog
} from '@/api/shop/userBalanceLog';
import { UserBalanceLog } from '@/api/shop/userBalanceLog/model';
import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
@@ -217,7 +223,9 @@
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updateUserBalanceLog : addUserBalanceLog;
const saveOrUpdate = isUpdate.value
? updateUserBalanceLog
: addUserBalanceLog;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
@@ -240,12 +248,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/userBalanceLog/index.vue
+22 -10
View File
@@ -45,7 +45,11 @@
</a-card>
<!-- 编辑弹窗 -->
<UserBalanceLogEdit v-model:visible="showEdit" :data="current" @done="reload" />
<UserBalanceLogEdit
v-model:visible="showEdit"
:data="current"
@done="reload"
/>
</div>
</div>
</template>
@@ -62,8 +66,15 @@
} from 'ele-admin-pro/es/ele-pro-table/types';
import Search from './components/search.vue';
import UserBalanceLogEdit from './components/userBalanceLogEdit.vue';
import { pageUserBalanceLog, removeUserBalanceLog, removeBatchUserBalanceLog } from '@/api/shop/userBalanceLog';
import type { UserBalanceLog, UserBalanceLogParam } from '@/api/shop/userBalanceLog/model';
import {
pageUserBalanceLog,
removeUserBalanceLog,
removeBatchUserBalanceLog
} from '@/api/shop/userBalanceLog';
import type {
UserBalanceLog,
UserBalanceLogParam
} from '@/api/shop/userBalanceLog/model';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -105,38 +116,39 @@
dataIndex: 'logId',
key: 'logId',
align: 'center',
width: 90,
width: 90
},
{
title: '用户ID',
dataIndex: 'userId',
key: 'userId',
align: 'center',
align: 'center'
},
{
title: '余额变动场景',
dataIndex: 'scene',
key: 'scene',
align: 'center',
customRender: ({ text }) => ['用户充值', '用户消费', '管理员操作', '订单退款'][text]
customRender: ({ text }) =>
['用户充值', '用户消费', '管理员操作', '订单退款'][text]
},
{
title: '变动金额',
dataIndex: 'money',
key: 'money',
align: 'center',
align: 'center'
},
{
title: '变动后余额',
dataIndex: 'balance',
key: 'balance',
align: 'center',
align: 'center'
},
{
title: '备注',
dataIndex: 'remark',
key: 'remark',
align: 'center',
align: 'center'
},
{
title: '操作时间',
@@ -146,7 +158,7 @@
sorter: true,
ellipsis: true,
customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
},
}
]);
/* 搜索 */
src/views/shop/users/components/userEdit.vue
+6 -1
View File
@@ -132,7 +132,12 @@
/>
</a-form-item>
<a-form-item label="身份证号码" name="idcard">
<a-input allow-clear placeholder="请输入" :disabled="true" v-model:value="form.idCard" />
<a-input
allow-clear
placeholder="请输入"
:disabled="true"
v-model:value="form.idCard"
/>
</a-form-item>
<a-form-item label="真实姓名" name="realName">
<a-input
src/views/shop/users/components/usersEdit.vue
+3 -7
View File
@@ -97,11 +97,7 @@
/>
</a-form-item>
<a-form-item label="" name="idcard">
<a-input
allow-clear
placeholder="请输入"
v-model:value="form.idcard"
/>
<a-input allow-clear placeholder="请输入" v-model:value="form.idcard" />
</a-form-item>
<a-form-item label="" name="truename">
<a-input
@@ -254,12 +250,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {
src/views/shop/users/index.vue
+15 -15
View File
@@ -105,73 +105,73 @@
dataIndex: 'id',
key: 'id',
align: 'center',
width: 90,
width: 90
},
{
title: '用户唯一小程序id',
dataIndex: 'openId',
key: 'openId',
align: 'center',
align: 'center'
},
{
title: '小程序用户秘钥',
dataIndex: 'sessionKey',
key: 'sessionKey',
align: 'center',
align: 'center'
},
{
title: '用户名',
dataIndex: 'username',
key: 'username',
align: 'center',
align: 'center'
},
{
title: '头像地址',
dataIndex: 'avatarUrl',
key: 'avatarUrl',
align: 'center',
align: 'center'
},
{
title: '1男，2女',
dataIndex: 'gender',
key: 'gender',
align: 'center',
align: 'center'
},
{
title: '国家',
dataIndex: 'country',
key: 'country',
align: 'center',
align: 'center'
},
{
title: '省份',
dataIndex: 'province',
key: 'province',
align: 'center',
align: 'center'
},
{
title: '城市',
dataIndex: 'city',
key: 'city',
align: 'center',
align: 'center'
},
{
title: '手机号码',
dataIndex: 'phone',
key: 'phone',
align: 'center',
align: 'center'
},
{
title: '积分',
dataIndex: 'integral',
key: 'integral',
align: 'center',
align: 'center'
},
{
title: '余额',
dataIndex: 'money',
key: 'money',
align: 'center',
align: 'center'
},
{
title: '注册时间',
@@ -186,19 +186,19 @@
title: '',
dataIndex: 'idcard',
key: 'idcard',
align: 'center',
align: 'center'
},
{
title: '',
dataIndex: 'truename',
key: 'truename',
align: 'center',
align: 'center'
},
{
title: '是否管理员：1是；2否',
dataIndex: 'isAdmin',
key: 'isAdmin',
align: 'center',
align: 'center'
},
{
title: '操作',
src/views/shop/wechatDeposit/components/wechatDepositEdit.vue
+9 -4
View File
@@ -103,7 +103,10 @@
import { ref, reactive, watch } from 'vue';
import { Form, message } from 'ant-design-vue';
import { assignObject, uuid } from 'ele-admin-pro';
import { addWechatDeposit, updateWechatDeposit } from '@/api/shop/wechatDeposit';
import {
addWechatDeposit,
updateWechatDeposit
} from '@/api/shop/wechatDeposit';
import { WechatDeposit } from '@/api/shop/wechatDeposit/model';
import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
@@ -206,7 +209,9 @@
const formData = {
...form
};
const saveOrUpdate = isUpdate.value ? updateWechatDeposit : addWechatDeposit;
const saveOrUpdate = isUpdate.value
? updateWechatDeposit
: addWechatDeposit;
saveOrUpdate(formData)
.then((msg) => {
loading.value = false;
@@ -229,12 +234,12 @@
images.value = [];
if (props.data) {
assignObject(form, props.data);
if(props.data.image){
if (props.data.image) {
images.value.push({
uid: uuid(),
url: props.data.image,
status: 'done'
})
});
}
isUpdate.value = true;
} else {