code-image-backup-public/lilishop-ui
1
0
Fork 0
mirror of https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git synced 2025-12-20 18:05:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

Browse Source
This commit is contained in:
pikachu1995@126.com
2024-01-22 15:24:41 +08:00
parent 5a29215b80 83beb81a3b
commit ff02cce191
385 changed files with 241037 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manager/src/views/goods-unit/index.vue
View File

@@ -3,6 +3,7 @@
<Card>
<Row class="operation">
<Button @click="add" type="primary">添加</Button>
<Button @click="refresh">刷新</Button>
<Button @click="delAll">批量删除</Button>
</Row>
<Table
@@ -284,6 +285,15 @@ export default {
},
});
},
// 刷新
refresh() {
this.loading = true;
setTimeout(() => {
this.getDataList();
this.loading = false;
this.$Message.success("刷新成功");
}, 500);
},
// 全部删除
delAll() {
if (this.selectCount <= 0) {

20
manager/src/views/goods/goods-info/goodsDetail.vue
View File

@@ -214,19 +214,19 @@ export default {
});
} else {
this.skuColumn.push(
{
title: "成本",
key: "cost",
render: (h, params) => {
console.log(params)
return h("priceColorScheme", {props:{value:params.row.cost,color:this.$mainColor}} );
},
},
// {
// title: "成本",
// key: "cost",
// render: (h, params) => {
// console.log(params)
// return h("priceColorScheme", {props:{value:params.row.cost,color:this.$mainColor}} );
// },
// },
{
title: "价格",
key: "price",
render: (h, params) => {v
return h("priceColorScheme", {props:{alue:params.row.price,color:this.$mainColor}} );
render: (h, params) => {
return h("priceColorScheme", {props:{value:params.row.price,color:this.$mainColor}} );
},
},{
title: "库存",

10
manager/src/views/goods/goods-manage/brand.vue
View File

@@ -10,6 +10,7 @@
</Form>
<Row class="operation padding-row">
<Button @click="add" type="primary">添加</Button>
<Button @click="refresh">刷新</Button>
</Row>
<Table :loading="loading" border :columns="columns" :data="data" ref="table"></Table>
<Row type="flex" justify="end" class="mt_10">
@@ -314,6 +315,15 @@ export default {
delete this.form.id;
this.modalVisible = true;
},
// 刷新
refresh() {
this.loading = true;
setTimeout(() => {
this.getDataList();
this.loading = false;
this.$Message.success("刷新成功");
}, 500);
},
// 编辑
edit(v) {
this.modalType = 1;

4
manager/src/views/member/advance/withdrawApply.vue
View File

@@ -9,8 +9,10 @@
<Form-item label="审核状态" prop="applyStatus">
<Select v-model="searchForm.applyStatus" clearable style="width: 200px">
<Option value="APPLY">申请中</Option>
<Option value="VIA_AUDITING">审核通过(提现成功)</Option>
<Option value="VIA_AUDITING">审核通过</Option>
<Option value="FAIL_AUDITING">审核拒绝</Option>
<Option value="SUCCESS">提现成功</Option>
<Option value="ERROR">提现失败</Option>
</Select>
</Form-item>
<Form-item label="申请时间">

4
manager/src/views/member/list/memberDetail.vue
View File

@@ -124,7 +124,7 @@
<Option value="DELIVERED">已发货</Option>
<Option value="COMPLETED">已完成</Option>
<Option value="TAKE">待核验</Option>
<Option value="CANCELLED">已取消</Option>
<Option value="CANCELLED">已关闭</Option>
</Select>
</Form-item>
<Form-item label="支付状态" prop="payStatus">
@@ -511,7 +511,7 @@
} else if (params.row.orderStatus == "TAKE") {
return h('div', [h('span', {}, '待核验'),]);
} else if (params.row.orderStatus == "CANCELLED") {
return h('div', [h('span', {}, '已取消'),]);
return h('div', [h('span', {}, '已关闭'),]);
}
}
},

6
manager/src/views/order/order/fictitiousOrderList.vue
View File

@@ -16,7 +16,7 @@
<!-- <Option value="TAKE">待核验</Option>-->
<!-- <Option value="COMPLETE">已完成</Option>-->
<!-- <Option value="WAIT_PINTUAN">待成团</Option>-->
<!-- <Option value="CANCELLED">已取消</Option>-->
<!-- <Option value="CANCELLED">已关闭</Option>-->
<!-- </Select>-->
<!-- </Form-item>-->
<Form-item label="下单时间">
@@ -127,7 +127,7 @@ export default {
} else if (params.row.orderStatus == "TAKE") {
return h("div", [h("tag", { props: { color: "volcano" } }, "待核验")]);
} else if (params.row.orderStatus == "CANCELLED") {
return h("div", [h("tag", { props: { color: "red" } }, "已取消")]);
return h("div", [h("tag", { props: { color: "red" } }, "已关闭")]);
}
}
},
@@ -191,7 +191,7 @@ export default {
{title: '已付款', value: 'PAID'},
{title: '待核验', value: 'TAKE'},
{title: '已完成', value: 'COMPLETED'},
{title: '已取消', value: 'CANCELLED'},
{title: '已关闭', value: 'CANCELLED'},
],
currentStatus: ''
};

5
manager/src/views/order/order/orderDetail.vue
View File

@@ -596,6 +596,11 @@ export default {
key: "num",
minWidth: 80,
},
{
title: "退款数量",
key: "returnGoodsNumber",
minWidth: 80,
},
{
title: "小计",
key: "subTotal",

6
manager/src/views/order/order/orderList.vue
View File

@@ -66,7 +66,7 @@
<!-- <Option value="DELIVERED">已发货</Option>-->
<!-- <Option value="COMPLETED">已完成</Option>-->
<!-- <Option value="TAKE">待核验</Option>-->
<!-- <Option value="CANCELLED">已取消</Option>-->
<!-- <Option value="CANCELLED">已关闭</Option>-->
<!-- <Option value="STAY_PICKED_UP">待自提</Option>-->
<!-- </Select>-->
<!-- </Form-item>-->
@@ -289,7 +289,7 @@ export default {
]);
} else if (params.row.orderStatus == "CANCELLED") {
return h("div", [
h("tag", { props: { color: "red" } }, "已取消"),
h("tag", { props: { color: "red" } }, "已关闭"),
]);
}
},
@@ -332,7 +332,7 @@ export default {
{title: '待核验', value: 'TAKE'},
{title: '待自提', value: 'STAY_PICKED_UP'},
{title: '已完成', value: 'COMPLETED'},
{title: '已取消', value: 'CANCELLED'},
{title: '已关闭', value: 'CANCELLED'},
],
currentStatus: ''

4
manager/src/views/page-decoration/wap/navbar.vue
View File

@@ -246,9 +246,7 @@ export default {
// 返回查询数据页面
goBack() {
this.$router.push({
path: "/wapList",
});
this.$router.go(-1);
},
// 保存

19
manager/src/views/page/article-manage/articleList.vue
View File

@@ -111,12 +111,12 @@
/>
</FormItem>
<FormItem class="form-item-view-el" label="文章内容" prop="content">
<editor
ref="editor"
openXss
v-model="form.content"
:init="{ ...initEditor,height:'800px' }"
></editor>
<tinymec
ref="editor"
openXss
v-model="form.content"
v-if="modalVisible"
></tinymec>
</FormItem>
<FormItem label="是否展示" prop="openStatus">
<i-switch size="large" v-model="form.openStatus">
@@ -146,12 +146,10 @@ import {
seeArticle,
updateArticleStatus,
} from "@/api/pages";
import Editor from "@tinymce/tinymce-vue";
import { initEditor } from "@/components/editor/config";
import tinymec from "@/components/editor/index.vue";
export default {
components: {
editor: Editor,
tinymec: tinymec,
},
props: {
selected: {
@@ -161,7 +159,6 @@ export default {
},
data() {
return {
initEditor: initEditor,
selectedIndex: 99999, // 已选下标
loading: true, // 表单加载状态
modalType: 0, // 添加或编辑标识

19
manager/src/views/privacy-content/index.vue
View File

@@ -17,12 +17,12 @@
</FormItem>
<FormItem class="form-item-view-el" label="文章内容" prop="content">
<editor
ref="editor"
openXss
v-model="form.article.content"
:init="{ ...initEditor,height:'800px' }"
></editor>
<editor
ref="editor"
openXss
v-model="form.article.content"
v-if="modalVisible"
></editor>
</FormItem>
</Form>
<div slot="footer">
@@ -40,12 +40,12 @@ import {
updatePrivacy,
getPrivacy,
} from "@/api/pages";
import Editor from "@tinymce/tinymce-vue";
import { initEditor } from "@/components/editor/config";
import tinymec from "@/components/editor/index.vue";
export default {
name: "privacy",
components: {
editor: Editor,
editor: tinymec,
},
props: {
selected: {
@@ -55,7 +55,6 @@ export default {
},
data() {
return {
initEditor,
loading: false, // 表单加载状态
modalVisible: false, // 添加或编辑显示
treeDataDefault: [],

22
manager/src/views/promotions/coupon/coupon.vue
View File

@@ -99,16 +99,16 @@
@click="close(row)"
>关闭
</Button>
<Button
class="ml_5"
v-if="
row.promotionStatus === 'CLOSE' || row.promotionStatus === 'END'
"
type="error"
size="small"
@click="remove(row)"
>删除
</Button>
<!--<Button-->
<!--class="ml_5"-->
<!--v-if="-->
<!--row.promotionStatus === 'CLOSE' || row.promotionStatus === 'END'-->
<!--"-->
<!--type="error"-->
<!--size="small"-->
<!--@click="remove(row)"-->
<!--&gt;删除-->
<!--</Button>-->
<Button
style="margin: 5px"
type="info"
@@ -286,7 +286,7 @@ export default {
slot: "action",
align: "center",
fixed: "right",
width: 150,
width: 250,
},
],
data: [], // 表单数据

14
manager/src/views/promotions/kanjia/kanjia-activity-goods.vue
View File

@@ -111,13 +111,13 @@
@click="edit(row, 'onlyView')"
>查看
</Button>
<Button
type="error"
size="small"
style="margin-right: 10px"
@click="delAll(row)"
>删除
</Button>
<!--<Button-->
<!--type="error"-->
<!--size="small"-->
<!--style="margin-right: 10px"-->
<!--@click="delAll(row)"-->
<!--&gt;删除-->
<!--</Button>-->
</template>
</Table>
<Row type="flex" justify="end" class="page">

16
manager/src/views/promotions/points-goods/points-goods.vue
View File

@@ -124,14 +124,14 @@
style="margin-right: 5px"
>关闭</Button
>
<Button
v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'END'"
type="error"
size="small"
@click="close(row.id)"
style="margin-right: 5px"
>删除</Button
>
<!--<Button-->
<!--v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'END'"-->
<!--type="error"-->
<!--size="small"-->
<!--@click="close(row.id)"-->
<!--style="margin-right: 5px"-->
<!--&gt;删除</Button-->
<!--&gt;-->
</template>
</Table>
<Row type="flex" justify="end" class="mt_10">

16
manager/src/views/promotions/seckill/seckill.vue
View File

@@ -93,14 +93,14 @@
>关闭</Button
>
&nbsp;
<Button
type="error"
size="small"
v-if="row.promotionStatus == 'CLOSE' || row.promotionStatus == 'END'"
ghost
@click="expire(row)"
>删除</Button
>
<!--<Button-->
<!--type="error"-->
<!--size="small"-->
<!--v-if="row.promotionStatus == 'CLOSE' || row.promotionStatus == 'END'"-->
<!--ghost-->
<!--@click="expire(row)"-->
<!--&gt;删除</Button-->
<!--&gt;-->
</template>
</Table>

4
manager/src/views/seller/shop/shopDetail.vue
View File

@@ -241,7 +241,7 @@
<Option value="DELIVERED">已发货</Option>
<Option value="COMPLETED">已完成</Option>
<Option value="TAKE">待核验</Option>
<Option value="CANCELLED">已取消</Option>
<Option value="CANCELLED">已关闭</Option>
</Select>
</Form-item>
<Form-item label="支付状态" prop="payStatus">
@@ -660,7 +660,7 @@
} else if (params.row.orderStatus == "TAKE") {
return h('div', [h('span', {}, '待核验'),]);
} else if (params.row.orderStatus == "CANCELLED") {
return h('div', [h('span', {}, '已取消'),]);
return h('div', [h('span', {}, '已关闭'),]);
}
}
},

2
manager/src/views/statistics/order.vue
View File

@@ -217,7 +217,7 @@ export default {
UNPAID: "未付款",
PAID: "已付款",
DELIVERED: "已发货",
CANCELLED: "已取消",
CANCELLED: "已关闭",
COMPLETED: "已完成",
TAKE: "已完成",
},

2
manager/src/views/statistics/order/orderDetail.vue
View File

@@ -93,7 +93,7 @@ export default {
UNPAID: "未付款",
PAID: "已付款",
DELIVERED: "已发货",
CANCELLED: "已取消",
CANCELLED: "已关闭",
COMPLETED: "已完成",
TAKE: "已完成",
},

2
manager/src/views/statistics/order/refundOrder.vue
View File

@@ -81,7 +81,7 @@ export default {
UNPAID: "未付款",
PAID: "已付款",
DELIVERED: "已发货",
CANCELLED: "已取消",
CANCELLED: "已关闭",
COMPLETED: "已完成",
TAKE: "已完成",
},

33
manager/src/views/sys/oss-manage/ossManage.vue
View File

@@ -294,6 +294,7 @@
v-model="groupFormValidate.id"
:data="treeData"
change-on-select
@on-change="treeDataChange"
></Cascader>
</FormItem>
<FormItem label="分组名称" prop="directoryName">
@@ -344,6 +345,7 @@ export default {
groupFormValidate: {
id: [],
level: 0,
directoryName: "",
},
groupRuleValidate: {
@@ -742,7 +744,6 @@ export default {
methods: {
handleContextMenu(val) {
console.log("val", val);
this.selectedGroupData = val;
},
// 编辑分组
@@ -757,7 +758,6 @@ export default {
this.groupFormValidate.level = this.selectedGroupData.level;
this.groupFormValidate.parentId = this.selectedGroupData.parentId;
console.log(this.groupFormValidate);
},
// 删除分组
async handleContextMenuDelete(val) {
@@ -773,6 +773,15 @@ export default {
},
});
},
treeDataChange(value, selectedData) {
if (value && value.length) {
if (value[value.length -1] == '0') {
this.groupFormValidate.level = 0;
} else {
this.groupFormValidate.level = Number(selectedData[selectedData.length -1].level) + 1;
}
}
},
// 保存/修改分组
async submitAddGroup() {
this.$refs["formValidate"].validate(async (valid) => {
@@ -784,8 +793,6 @@ export default {
// params.directoryType = this.selectedGroupData.directoryType
params.parentId = params.id[params.id.length - 1];
// params.type = this.selectedGroupData.type
params.level =
params.parentId == "0" ? 0 : this.selectedGroupData.level + 1;
delete params.id;
res = await addFileDirectory(params);
} else {
@@ -875,14 +882,14 @@ export default {
// 选择分类回调
handleCateChange(data) {
this.selectedGroupData = data[0];
let {value, type} = data[0];
this.list.push({
value,
type,
});
let {value, type, level} = data[0];
this.list.push({value, type, level});
this.searchForm.fileDirectoryId = value;
if (value === "0") {
if (value === "0" || value === 0) {
delete this.searchForm.fileDirectoryId;
this.groupFormValidate.level = 0;
} else {
this.groupFormValidate.level = Number(level) + 1;
}
this.searchForm.userEnums = type;
this.getDataList();
@@ -1061,7 +1068,7 @@ export default {
ids += e.id + ",";
});
ids = ids.substring(0, ids.length - 1);
deleteFile({ids: ids}).then((res) => {
deleteFile(ids).then((res) => {
this.$Modal.remove();
if (res.success) {
this.$Message.success("批量删除文件成功");
@@ -1082,7 +1089,7 @@ export default {
content: "您确认要删除文件 " + v.name + " ?",
loading: true,
onOk: () => {
deleteFile({ids: v.id}).then((res) => {
deleteFile(v.id).then((res) => {
this.$Modal.remove();
if (res.success) {
this.$Message.success("删除文件 " + v.name + " 成功");
@@ -1131,7 +1138,6 @@ export default {
},
// 清除选中状态
clearSelectAll() {
console.log("清除选中状态");
this.$refs.table.selectAll(false);
this.totalSize = "";
},
@@ -1144,6 +1150,7 @@ export default {
size += item.fileSize * 1.0;
});
this.totalSize = ((size * 1.0) / (1024 * 1024)).toFixed(2) + " MB";
this.$emit("selected", e)
},
},
mounted() {