-
+
+
+
+ 添加一级分类
-
+
+
-
-
-
- 绑定
-
-
-
- 编辑绑定品牌
- 编辑绑定规格
- 编辑绑定参数
-
-
- |
-
-
- 操作
-
-
-
- 编辑
- 启用
- 禁用
- 删除
-
-
- |
- 添加子分类
-
+ :tree="{ childrenKey: 'children', treeNodeColumnIndex: 0, indent: 24, expandTreeNodeOnClick: true }"
+ />
+
-
- %
- %
-
-
-
-
-
- {{ row.deleteFlag == false ? "正常启用" : "禁用" }}
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ parentTitle }}
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
-
-
+ :showJumper="true"
+ @change="onPaginationChange"
+ />
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
@@ -30,112 +30,123 @@ export default {
name: "walletLog",
data() {
return {
- loading: true, // 表单加载状态
- searchForm: {
- // 搜索框初始化对象
- pageNumber: 1, // 当前页数
- pageSize: 20, // 页面大小
- sort: "createTime", // 默认排序字段
- order: "desc", // 默认排序方式
- startDate: "", // 起始时间
- endDate: "", // 终止时间
- memberName: "",
- },
- selectDate: null, // 选择时间段
+ loading: true,
+ searchForm: {
+ pageNumber: 1,
+ pageSize: 20,
+ sort: "createTime",
+ order: "desc",
+ startDate: "",
+ endDate: "",
+ memberName: "",
+ },
+ selectDate: [],
columns: [
- // 表头
{
title: "会员名称",
- key: "memberName",
+ colKey: "memberName",
minWidth: 100,
+ align: "left",
},
{
title: "变动金额",
- key: "money",
+ colKey: "money",
width: 150,
- render: (h, params) => {
- if (params.row.money >0) {
- return h("priceColorScheme", {props:{value:params.row.money,color:'green'}} );
+ align: "left",
+ cell: (h, params) => {
+ if (params.row.money > 0) {
+ return h("priceColorScheme", { props: { value: params.row.money, color: "green" } });
} else if (params.row.money < 0) {
- return h("priceColorScheme", {props:{value:params.row.money,color:this.$mainColor}} );
+ return h("priceColorScheme", { props: { value: params.row.money, color: this.$mainColor } });
}
},
},
-
{
title: "变更时间",
- key: "createTime",
+ colKey: "createTime",
width: 200,
+ align: "left",
},
{
title: "业务类型",
- key: "serviceType",
+ colKey: "serviceType",
width: 200,
- render: (h, params) => {
- if (params.row.serviceType == "WALLET_WITHDRAWAL") {
- return h("div", [h("span", {}, "余额提现")]);
- } else if (params.row.serviceType == "WALLET_PAY") {
- return h("div", [h("span", {}, "余额支付")]);
- } else if (params.row.serviceType == "WALLET_REFUND") {
- return h("div", [h("span", {}, "余额退款")]);
- } else if (params.row.serviceType == "WALLET_RECHARGE") {
- return h("div", [h("span", {}, "余额充值")]);
- } else {
- return h("div", [h("span", {}, "佣金提成")]);
- }
+ align: "left",
+ cell: (h, params) => {
+ const map = {
+ WALLET_WITHDRAWAL: "余额提现",
+ WALLET_PAY: "余额支付",
+ WALLET_REFUND: "余额退款",
+ WALLET_RECHARGE: "余额充值",
+ };
+ return h("div", [h("span", {}, map[params.row.serviceType] || "佣金提成")]);
},
},
{
title: "详细",
- key: "detail",
+ colKey: "detail",
minWidth: 300,
tooltip: true,
+ align: "left",
},
],
- data: [], // 表单数据
- total: 0, // 表单数据总数
+ data: [],
+ total: 0,
};
},
methods: {
- // 初始化数据
init() {
this.getDataList();
},
- // 分页 改变页码
changePage(v) {
this.searchForm.pageNumber = v;
this.getDataList();
},
- // 分页 改变页数
changePageSize(v) {
- this.searchForm.pageNumber = 1;
this.searchForm.pageSize = v;
this.getDataList();
},
- // 搜索
+ onPaginationChange(info) {
+ if (info && typeof info.pageSize !== "undefined" && info.pageSize !== this.searchForm.pageSize) {
+ this.changePageSize(info.pageSize);
+ }
+ if (info && typeof info.current !== "undefined") {
+ this.changePage(info.current);
+ }
+ },
handleSearch() {
this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 20;
this.getDataList();
},
- // 时间段赋值
+ handleReset() {
+ this.searchForm.pageNumber = 1;
+ this.searchForm.pageSize = 20;
+ this.searchForm.memberName = "";
+ this.searchForm.startDate = "";
+ this.searchForm.endDate = "";
+ this.selectDate = [];
+ this.getDataList();
+ },
selectDateRange(v) {
if (v) {
this.searchForm.startDate = v[0];
this.searchForm.endDate = v[1];
}
},
- // 获取列表数据
getDataList() {
- getUserWallet(this.searchForm).then((res) => {
- this.loading = false;
- if (res.success) {
- this.data = res.result.records;
- this.total = res.result.total;
- }
- });
- this.total = this.data.length;
- this.loading = false;
+ this.loading = true;
+ getUserWallet(this.searchForm)
+ .then((res) => {
+ this.loading = false;
+ if (res.success) {
+ this.data = res.result.records;
+ this.total = res.result.total;
+ }
+ })
+ .catch(() => {
+ this.loading = false;
+ });
},
},
mounted() {
diff --git a/manager/src/views/member/advance/withdrawApply.vue b/manager/src/views/member/advance/withdrawApply.vue
index 1f7b6aba..81f4166e 100644
--- a/manager/src/views/member/advance/withdrawApply.vue
+++ b/manager/src/views/member/advance/withdrawApply.vue
@@ -1,212 +1,169 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
申请编号：{{ showList.sn }}
+
用户名称：{{ showList.memberName }}
+
+
提现状态：{{ showList.applyStatus | paramTypeFilter }}
+
申请时间：{{ showList.createTime }}
+
+
+
-
+
+
+ 拒绝
+ 通过
+
+
+
+
+
+
+
申请编号：{{ showList.sn }}
+
用户名称：{{ showList.memberName }}
+
+
提现状态：{{ showList.applyStatus | paramTypeFilter }}
+
申请时间：{{ showList.createTime }}
+
审核时间：{{ showList.inspectTime }}
+
审核备注：{{ showList.inspectRemark || '暂无备注' }}
+ 返回
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
-
-
-
-
+ 选择
+
+
+
+
-
+
+ 关闭
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 添加
+
+
+
+
+
+
+
+
+ 添加
+
+
+
+
+
+
+
+
+ 添加
+
+
+
+
+
+
+
+
+ 添加
+ 刷新
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
-
+
-
-
-
+
+
+ 添加页面
-
+
页面名称
@@ -28,73 +28,55 @@
{{ item.name || "暂无模板昵称" }}
-
开
关
-
+
-
-
-
-
-
+
编辑
+
装修
+
删除
暂无更多模板
-
-
-
+
-
-
+
+
+
+
+
+
![]()
- 编辑
![]()
-
-
-
+
+ 搜索
@@ -66,13 +65,11 @@
@@ -89,35 +86,34 @@
建议尺寸：{{ topAdvert.size }}
- 图片链接：
+ 选择链接
- 选择图片：选择图片
- 选择背景色：
+ 选择背景色：
-
-
-
-
-
-
-
-
- 这里展示历史某一天的热词数据统计，可根据需求配置每日持久化多少条数据。
-
-
-
+
+
+
+
+
+
-
+ 保存
-
+
diff --git a/manager/src/views/promotions/coupon-activity/coupon-publish.vue b/manager/src/views/promotions/coupon-activity/coupon-publish.vue
index e1b62d1b..b347b3cf 100644
--- a/manager/src/views/promotions/coupon-activity/coupon-publish.vue
+++ b/manager/src/views/promotions/coupon-activity/coupon-publish.vue
@@ -1,148 +1,71 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -150,264 +73,130 @@
import couponTemplate from "@/views/promotions/coupon/coupon";
import userList from "@/views/member/list/index";
import { saveActivityCoupon } from "@/api/promotion";
-import { promotionsScopeTypeRender } from "@/utils/promotions";
+import { MessagePlugin } from "tdesign-vue";
export default {
name: "add-coupon-activity",
- components: {
- couponTemplate,
- userList,
- },
+ components: { couponTemplate, userList },
data() {
return {
- options: {
- disabledDate(date) {
- return date && date.valueOf() < Date.now() - 86400000;
- },
- },
- showCouponSelect: false, //显示优惠券选择框
- rangeTime: "", //时间区间
- checkUserList: false, //会员选择器
- selectedMember: [], //选择的会员
+ showCouponSelect: false,
+ checkUserList: false,
+ selectedMember: [],
form: {
- promotionName: "", //活动名称
- activityScope: "ALL", //活动范围 ，默认全体发券
- couponActivityType: "REGISTERED", //触发活动方式 默认新人赠券
- startTime: "", //开始时间
- endTime: "", //结束时间
- memberDTOS: [], //指定会员范围
- couponActivityItems: [], //优惠券列表
- couponFrequencyEnum:"", //选择周期
+ promotionName: "",
+ activityScope: "ALL",
+ couponActivityType: "REGISTERED",
+ startTime: "",
+ endTime: "",
+ memberDTOS: [],
+ couponActivityItems: [],
+ couponFrequencyEnum: "",
+ rangeTime: []
},
- submitLoading: false, // 添加或编辑提交状态
- selectCouponList: [], //选择的优惠券列表
+ submitLoading: false,
+ selectCouponList: [],
formRule: {
promotionName: [{ required: true, message: "活动名称不能为空" }],
rangeTime: [{ required: true, message: "请选择活动有效期" }],
- description: [{ required: true, message: "请输入范围描述" }],
},
- // 用户表格
userColumns: [
- {
- title: "用户名称",
- key: "nickName",
- minWidth: 120,
- },
- {
- title: "手机号",
- key: "mobile",
- render: (h, params) => {
- return h("div", params.row.mobile || "暂未填写");
- },
- },
- {
- title: "最后登录时间",
- key: "lastLoginDate",
- },
- {
- title: "操作",
- key: "action",
- minWidth: 50,
- align: "center",
- render: (h, params) => {
- return h(
- "a",
- {
- style: {
- color: "#2d8cf0",
- cursor: "pointer",
- textDecoration: "none"
- },
- on: {
- click: () => {
- this.delUser(params.index);
- },
- },
- },
- "删除"
- );
- },
- },
+ { title: "用户名称", colKey: "nickName", minWidth: 120 },
+ { title: "手机号", colKey: "mobile", cell: (h, { row }) => h("div", row.mobile || "暂未填写") },
+ { title: "最后登录时间", colKey: "lastLoginDate" },
+ { title: "操作", colKey: "action", minWidth: 80, align: "center", cell: (h, { rowIndex }) => h("a", { style: { color: "#2d8cf0", cursor: "pointer", textDecoration: "none" }, on: { click: () => this.delUser(rowIndex) } }, "删除") },
],
- //优惠券表格
columns: [
- {
- title: "优惠券名称",
- key: "couponName",
- minWidth: 120,
- },
- {
- title: "品类描述",
- key: "scopeType",
- width: 120,
- render: (h, params) => {
- return promotionsScopeTypeRender(h, params);
- },
- },
- {
- title: "面额/折扣",
- key: "couponName",
- minWidth: 120,
- render: (h, params) => {
- if (params.row.price) {
- return h("priceColorScheme", {props:{value:params.row.price,color:this.$mainColor}} );
-
- } else {
- return h("div", params.row.couponDiscount + "折");
- }
- },
- },
-
- {
- title: "赠送数量",
- type: "template",
- slot: "sendNum",
- minWidth: 120,
- },
- {
- title: "操作",
- key: "action",
- minWidth: 50,
- align: "center",
- render: (h, params) => {
- return h(
- "Button",
- {
- props: {
- size: "small",
- type: "error",
- ghost: true,
- },
- on: {
- click: () => {
- this.delCoupon(params.index);
- },
- },
- },
- "删除"
- );
- },
- },
+ { title: "优惠券名称", colKey: "couponName", minWidth: 120 },
+ { title: "品类描述", colKey: "scopeType", width: 120, cell: (h, { row }) => {
+ const t = row.scopeType;
+ return t === "ALL"
+ ? h("t-tag", { props: { theme: "default", variant: "light" } }, "全品类")
+ : t === "PORTION_GOODS_CATEGORY"
+ ? h("t-tag", { props: { theme: "warning", variant: "light" } }, "商品分类")
+ : t === "PORTION_SHOP_CATEGORY"
+ ? h("t-tag", { props: { theme: "pink", variant: "light" } }, "店铺分类")
+ : h("t-tag", { props: { theme: "magenta", variant: "light" } }, "指定商品");
+ } },
+ { title: "面额/折扣", colKey: "priceOrDiscount", minWidth: 120, cell: (h, { row }) => row.price ? h("priceColorScheme", { props: { value: row.price, color: this.$mainColor } }) : h("div", row.couponDiscount + "折") },
+ { title: "赠送数量", colKey: "sendNum", minWidth: 120, cell: "sendNum" },
+ { title: "操作", colKey: "action", minWidth: 80, align: "center", cell: (h, { rowIndex }) => h("t-button", { props: { size: "small", theme: "danger", variant: "base" }, on: { click: () => this.delCoupon(rowIndex) } }, "删除") },
],
};
},
+ mounted() {
+ if (!Array.isArray(this.form.rangeTime)) {
+ this.form.rangeTime = [];
+ }
+ },
methods: {
- // 返回已选择的用户
+ disableDate(date) { return date && date.getTime() < Date.now() - 86400000; },
callbackSelectUser(val) {
- // 每次将返回的数据回调判断
- let findUser = this.selectedMember.find((item) => {
- return item.id === val.id;
- });
- // 如果没有则添加
+ const findUser = this.selectedMember.find((item) => item.id === val.id);
if (!findUser) {
this.selectedMember.push(val);
} else {
- // 有重复数据就删除
- this.selectedMember.map((item, index) => {
- if (item.id === findUser.id) {
- this.selectedMember.splice(index, 1);
- }
- });
+ this.selectedMember = this.selectedMember.filter((item) => item.id !== findUser.id);
}
this.reSelectMember();
},
-
- // 删除选择的会员
delUser(index) {
this.selectedMember.splice(index, 1);
this.reSelectMember();
},
- //更新选择的会员
reSelectMember() {
- this.form.memberDTOS = this.selectedMember.map((item) => {
- return {
- nickName: item.nickName,
- id: item.id,
- };
- });
- },
- /**
- * 返回优惠券*/
- selectedCoupon(val) {
- this.selectCouponList = val;
- this.reSelectCoupon();
- },
- // 删除选择的优惠券
- delCoupon(index) {
- this.selectCouponList.splice(index, 1);
- this.reSelectCoupon();
+ this.form.memberDTOS = this.selectedMember.map((item) => ({ nickName: item.nickName, id: item.id }));
},
+ selectedCoupon(val) { this.selectCouponList = val; this.reSelectCoupon(); },
+ delCoupon(index) { this.selectCouponList.splice(index, 1); this.reSelectCoupon(); },
reSelectCoupon() {
- // 清空原有数据
- this.form.couponActivityItems = this.selectCouponList.map((item) => {
- return {
- num: 1,
- couponId: item.id,
- };
- });
+ this.form.couponActivityItems = this.selectCouponList.map((item) => ({ num: 1, couponId: item.id }));
},
- // 添加指定用户
- addVip() {
- this.checkUserList = true;
- this.$nextTick(() => {
- this.$refs.memberLayout.selectedMember = true;
- });
- },
- //显示优惠券选择框
- showSelector() {
- this.showCouponSelect = true;
- },
- /** 保存平台优惠券 */
+ addVip() { this.checkUserList = true; this.$nextTick(() => { this.$refs.memberLayout.selectedMember = true; }); },
+ showSelector() { this.showCouponSelect = true; },
handleSubmit() {
- if(this.form.couponFrequencyEnum !== ''){
- console.log(this.activityScope)
- if(this.form.activityScope == 'ALL'){
- this.form.startTime = this.$options.filters.unixToDate(this.rangeTime[0] / 1000);
- this.form.endTime = this.$options.filters.unixToDate(this.rangeTime[1] / 1000);
-
+ if (this.form.couponFrequencyEnum !== '') {
+ if (this.form.activityScope == 'ALL') {
+ this.form.startTime = this.$options.filters.unixToDate(this.form.rangeTime[0] / 1000);
+ this.form.endTime = this.$options.filters.unixToDate(this.form.rangeTime[1] / 1000);
this.$refs.form.validate((valid) => {
if (valid) {
const params = JSON.parse(JSON.stringify(this.form));
this.submitLoading = true;
- // 添加 避免编辑后传入id等数据 记得删除
delete params.id;
saveActivityCoupon(params).then((res) => {
this.submitLoading = false;
if (res.success) {
- this.$Message.success("优惠券活动创建成功");
+ MessagePlugin.success("优惠券活动创建成功");
this.closeCurrentPage();
}
});
}
});
- }else {
- this.$Message.info('自动发券只能全用户发送')
- this.form.couponActivityType = 'SPECIFY'
- this.form.activityScope = 'ALL'
+ } else {
+ MessagePlugin.info('自动发券只能全用户发送');
+ this.form.couponActivityType = 'SPECIFY';
+ this.form.activityScope = 'ALL';
}
- }else{
- this.form.startTime = this.$options.filters.unixToDate(this.rangeTime[0] / 1000);
- this.form.endTime = this.$options.filters.unixToDate(this.rangeTime[1] / 1000);
-
- this.$refs.form.validate((valid) => {
- if (valid) {
- const params = JSON.parse(JSON.stringify(this.form));
- this.submitLoading = true;
- // 添加 避免编辑后传入id等数据 记得删除
- delete params.id;
- saveActivityCoupon(params).then((res) => {
- this.submitLoading = false;
- if (res.success) {
- this.$Message.success("优惠券活动创建成功");
- this.closeCurrentPage();
- }
- });
- }
- });
+ } else {
+ this.form.startTime = this.$options.filters.unixToDate(this.form.rangeTime[0] / 1000);
+ this.form.endTime = this.$options.filters.unixToDate(this.form.rangeTime[1] / 1000);
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ const params = JSON.parse(JSON.stringify(this.form));
+ this.submitLoading = true;
+ delete params.id;
+ saveActivityCoupon(params).then((res) => {
+ this.submitLoading = false;
+ if (res.success) {
+ MessagePlugin.success("优惠券活动创建成功");
+ this.closeCurrentPage();
+ }
+ });
+ }
+ });
}
-
},
- // 关闭当前页面
closeCurrentPage() {
this.$store.commit("removeTag", "add-platform-coupon");
localStorage.pageOpenedList = JSON.stringify(this.$store.state.app.pageOpenedList);
@@ -417,7 +206,7 @@ export default {
};
-
diff --git a/manager/src/views/promotions/full-discount/full-discount.vue b/manager/src/views/promotions/full-discount/full-discount.vue
index 0a3c0658..d81c8e91 100644
--- a/manager/src/views/promotions/full-discount/full-discount.vue
+++ b/manager/src/views/promotions/full-discount/full-discount.vue
@@ -1,223 +1,132 @@
-
-
-
-
-
-
-
-
- {{ unixDate(row.applyEndTime) }}
-
-
- {{ row.fullMinusFlag ? "满减" : "满折" }}
-
-
- {{ item }}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/manager/src/views/seller/bill/accountStatementBill.vue b/manager/src/views/seller/bill/accountStatementBill.vue
index 6730208d..7467bf8e 100644
--- a/manager/src/views/seller/bill/accountStatementBill.vue
+++ b/manager/src/views/seller/bill/accountStatementBill.vue
@@ -1,28 +1,26 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
diff --git a/manager/src/views/seller/shop/shopList.vue b/manager/src/views/seller/shop/shopList.vue
index 1c1008e6..d5099bf6 100644
--- a/manager/src/views/seller/shop/shopList.vue
+++ b/manager/src/views/seller/shop/shopList.vue
@@ -1,50 +1,67 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
+
+
+
+ {{ row.storeAddressPath || '暂未填写' }}
+
+
+ {{ row.selfOperated ? '自营' : '非自营' }}
+
+
+ 开启中
+ 已关闭
+ 申请中
+ 审核中
+ 审核拒绝
+
+
+ 选择
+ |
+ 查看
+ |
+ 修改
+ |
+ 关闭
+ 开启
+
+ 审核
+ |
+ 修改
+
+
+
+
+
+
+
@@ -55,11 +72,13 @@ import {
enableBrand,
shopAudit,
} from "@/api/shops";
+import { MessagePlugin, DialogPlugin } from "tdesign-vue";
export default {
name: "shop",
data() {
return {
loading: true, // 表单加载状态
+ activeStatus: 'ALL',
searchForm: {
// 搜索框初始化对象
pageNumber: 1, // 当前页数
@@ -68,233 +87,17 @@ export default {
order: "desc", // 默认排序方式
startDate: "", // 起始时间
endDate: "", // 终止时间
+ storeDisable: "",
},
- selectDate: null, // 创建时间
+ selectDate: [], // 创建时间
columns: [
- // 表头
- {
- title: "店铺名称",
- key: "storeName",
- minWidth: 120,
- align: "left",
- },
- {
- title: "会员名称",
- key: "memberName",
- minWidth: 130,
- tooltip: true
- },
- {
- title: "店铺地址",
- key: "storeAddressPath",
- width: 300,
- tooltip: true,
- render: (h, params) => {
- return h(
- "Tag",
- {
-
- },
- params.row.storeAddressPath || "暂未填写"
- );
- },
- },
- {
- title: "是否自营",
- key: "selfOperated",
- align: "left",
- width: 120,
- render: (h, params) => {
- return h(
- "Tag",
- {
- props: {
- color: params.row.selfOperated ? "volcano" : "green",
- },
- },
- params.row.selfOperated ? "自营" : "非自营"
- );
- },
- },
-
- {
- title: "店铺状态",
- key: "storeDisable",
- align: "left",
- width: 130,
- render: (h, params) => {
- if (params.row.storeDisable == "OPEN") {
- return h("Tag", {props: {color: "green",},},"开启中");
- } else if (params.row.storeDisable == "CLOSED") {
- return h("Tag", {props: {color: "volcano",},},"已关闭");
- } else if (params.row.storeDisable == "APPLY") {
- return h("Tag", {props: {color: "geekblue",},},"申请中");
- } else if (params.row.storeDisable == "APPLYING") {
- return h("Tag", {props: {color: "purple",},},"审核中");
- } else if (params.row.storeDisable == "REFUSED") {
- return h("Tag", {props: {color: "red",},},"审核拒绝");
- }
- },
- },
- {
- title: "创建时间",
- key: "createTime",
- align: "left",
- width: 170
- },
- {
- title: "操作",
- key: "action",
- width: 200,
- align: "center",
- fixed: "right",
- render: (h, params) => {
- let enableOrDisable = "";
- if (params.row.storeDisable == "OPEN") {
- enableOrDisable = h(
- "a",
- {
- style: {
- color: "#2d8cf0",
- cursor: "pointer",
- textDecoration: "none",
- },
- on: {
- click: () => {
- this.disable(params.row);
- },
- },
- },
- "关闭"
- );
- } else if (params.row.storeDisable == "CLOSED") {
- enableOrDisable = h(
- "a",
- {
- style: {
- color: "#2d8cf0",
- cursor: "pointer",
- textDecoration: "none",
- },
- on: {
- click: () => {
- this.enable(params.row);
- },
- },
- },
- "开启"
- );
- } else if (params.row.storeDisable == "APPLYING") {
- return h("div", [
- h(
- "a",
- {
- style: {
- color: "#2d8cf0",
- cursor: "pointer",
- textDecoration: "none",
- },
- on: {
- click: () => {
- this.audit(params.row);
- },
- },
- },
- "审核"
- ),
- h(
- "span",
- { style: { margin: "0 8px", color: "#dcdee2" } },
- "|"
- ),
- h(
- "a",
- {
- style: {
- color: "#2d8cf0",
- cursor: "pointer",
- textDecoration: "none",
- },
- on: {
- click: () => {
- this.edit(params.row);
- },
- },
- },
- "修改"
- ),
- ]);
- }
-
- return h("div", [
- h(
- "a",
- {
- style: {
- color: "#2d8cf0",
- cursor: "pointer",
- textDecoration: "none",
- display: this.selectedShop ? "inline-block" : "none",
- },
- on: {
- click: () => {
- this.callback(params.row);
- },
- },
- },
- "选择"
- ),
- h(
- "span",
- { style: { margin: "0 8px", color: "#dcdee2", display: this.selectedShop ? "inline-block" : "none" } },
- "|"
- ),
- h(
- "a",
- {
- style: {
- color: "#2d8cf0",
- cursor: "pointer",
- textDecoration: "none",
- },
- on: {
- click: () => {
- this.detail(params.row);
- },
- },
- },
- "查看"
- ),
- h(
- "span",
- { style: { margin: "0 8px", color: "#dcdee2" } },
- "|"
- ),
- h(
- "a",
- {
- style: {
- color: "#2d8cf0",
- cursor: "pointer",
- textDecoration: "none",
- },
- on: {
- click: () => {
- this.edit(params.row);
- },
- },
- },
- "修改"
- ),
- h(
- "span",
- { style: { margin: "0 8px", color: "#dcdee2" } },
- "|"
- ),
- enableOrDisable,
- ]);
- },
- },
+ { title: "店铺名称", colKey: "storeName", width: 120, align: "left" },
+ { title: "会员名称", colKey: "memberName", width: 130, ellipsis: true },
+ { title: "店铺地址", colKey: "storeAddressPath", width: 300 },
+ { title: "是否自营", colKey: "selfOperated", width: 120, align: "left" },
+ { title: "店铺状态", colKey: "storeDisable", width: 130, align: "left" },
+ { title: "创建时间", colKey: "createTime", width: 170, align: "left" },
+ { title: "操作", colKey: "action", width: 200, align: "center", fixed: "right" },
],
data: [], // 表单数据
total: 0, // 表单数据总数
@@ -311,15 +114,15 @@ export default {
init() {
this.getDataList();
},
- // 分页 改变页码
- changePage(v) {
- this.searchForm.pageNumber = v;
+ onStatusTabChange(v) {
+ this.activeStatus = v;
+ this.searchForm.pageNumber = 1;
this.getDataList();
},
- // 分页 改变页数
- changePageSize(v) {
- this.searchForm.pageNumber = 1;
- this.searchForm.pageSize = v;
+ onPaginationChange(pagination) {
+ const { current, pageSize } = pagination;
+ this.searchForm.pageNumber = current;
+ this.searchForm.pageSize = pageSize;
this.getDataList();
},
// 搜索
@@ -330,15 +133,25 @@ export default {
},
// 起止时间分别赋值
selectDateRange(v) {
- if (v) {
- this.searchForm.startDate = v[0];
- this.searchForm.endDate = v[1];
+ if (Array.isArray(v) && v.length === 2 && v[0] && v[1]) {
+ // v 为字符串或时间戳均可，由后端统一按字符串接收
+ const toStr = (val) => {
+ if (typeof val === 'number') {
+ return this.$options.filters.unixToDate(parseInt(val / 1000));
+ }
+ return String(val);
+ };
+ this.searchForm.startDate = toStr(v[0]);
+ this.searchForm.endDate = toStr(v[1]);
+ } else {
+ this.searchForm.startDate = '';
+ this.searchForm.endDate = '';
}
},
// 获取列表数据
getDataList() {
- console.log(this.searchForm)
this.loading = true;
+ this.searchForm.storeDisable = this.activeStatus === 'ALL' ? '' : this.activeStatus;
// 带多条件搜索参数获取表单数据 请自行修改接口
getShopListData(this.searchForm).then((res) => {
this.loading = false;
@@ -358,17 +171,16 @@ export default {
edit(v) {
this.$router.push({ path: '/shop-operation', query: { shopId: v.id } });
},
- // 关闭店铺
disable(v) {
- this.$Modal.confirm({
- title: "确认关闭",
+ const dlg = DialogPlugin.confirm({
+ header: "确认关闭",
content: "您确认要关闭店铺 " + v.storeName + " ?",
- loading: true,
- onOk: () => {
+ theme: "warning",
+ onConfirm: () => {
disableShop(v.id).then((res) => {
- this.$Modal.remove();
if (res.success) {
- this.$Message.success("操作成功");
+ MessagePlugin.success("操作成功");
+ dlg.hide();
this.getDataList();
}
});
@@ -381,43 +193,42 @@ export default {
},
// 审核店铺
audit(v) {
- this.$Modal.confirm({
- title: "审核店铺",
+ const dlg = DialogPlugin.confirm({
+ header: "审核店铺",
content: "您确认要审核通过店铺 " + v.storeName + " ?",
- okText: "通过",
- cancelText: "驳回",
- loading: true,
- onOk: () => {
+ confirmBtn: "通过",
+ cancelBtn: "驳回",
+ theme: "warning",
+ onConfirm: () => {
shopAudit(v.id, 0).then((res) => {
- this.$Modal.remove();
if (res.success) {
- this.$Message.success("操作成功");
+ MessagePlugin.success("操作成功");
+ dlg.hide();
this.getDataList();
}
});
},
onCancel: () => {
shopAudit(v.id, 1).then((res) => {
- this.$Modal.remove();
if (res.success) {
- this.$Message.success("操作成功");
+ MessagePlugin.success("操作成功");
+ dlg.hide();
this.getDataList();
}
});
},
});
},
- // 启用店铺
enable(v) {
- this.$Modal.confirm({
- title: "确认开启",
+ const dlg = DialogPlugin.confirm({
+ header: "确认开启",
content: "您确认要开启店铺 " + v.storeName + " ?",
- loading: true,
- onOk: () => {
+ theme: "warning",
+ onConfirm: () => {
enableBrand(v.id).then((res) => {
- this.$Modal.remove();
if (res.success) {
- this.$Message.success("操作成功");
+ MessagePlugin.success("操作成功");
+ dlg.hide();
this.getDataList();
}
});
@@ -426,7 +237,14 @@ export default {
},
},
mounted() {
+ if (!Array.isArray(this.selectDate)) {
+ this.selectDate = [];
+ }
this.init();
},
};
+
diff --git a/manager/src/views/seller/shop/shopOperation.vue b/manager/src/views/seller/shop/shopOperation.vue
index 4c7426fb..272765e3 100644
--- a/manager/src/views/seller/shop/shopOperation.vue
+++ b/manager/src/views/seller/shop/shopOperation.vue
@@ -1,7 +1,13 @@