zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc商品列表样式修改，商家注释添加，订单统计，退订单按钮样式

master
mabo 2021-07-16 17:57:24 +08:00
parent 133febe7a7
commit 07f41f5cb6
31 changed files with 160 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buyer/src/components/indexDecorate/modelFormItem.vue
View File

@ -283,4 +283,3 @@ export default {
}
}
</style>

6
buyer/src/components/nav/GoodsClassNav.vue
View File

@ -189,7 +189,6 @@ export default {
selectedItem: {
// 监听已选条件，来调用列表接口
handler (val) {
console.log(val);
let classification = [];
this.params.brandId = ''
this.params.prop = ''
@ -248,7 +247,7 @@ export default {
this.$set(this.tabBar, 'second', second)
}
},
cateClick (item, index) { // 点选分类
cateClick (item, index) { // 点选分类
switch (index) {
case 1:
this.$router.push({
@ -636,7 +635,8 @@ export default {
> div:first-child {
width: 100px;
background: #eee;
padding: 10px 0 0 10px;
padding-left: 10px;
line-height: 30px;
}
> div:last-child {
width: 1100px;

6
buyer/src/main.js
View File

@ -32,7 +32,11 @@ router.afterEach(route => {
Vue.prototype.linkTo = function (url) {
if (url.substr(0, 1) === '/') { // 非外部链接，没有origin，只有路由地址
window.open(location.origin + url, '_blank');
if (router.mode === 'hash') {
window.open(location.origin + '/#' + url, '_blank');
} else {
window.open(location.origin + url, '_blank');
}
} else { // 外部链接，完整的url地址
window.open(url, '_blank')
}

2
buyer/src/pages/GoodsList.vue
View File

@ -69,7 +69,7 @@
>人评价
</div>
<div class="goods-show-seller">
<Tag v-if="item.selfOperated" style="padding:0 4px;" size="small" color="error">自营</Tag><span>{{ item.storeName }}</span>
<Tag v-if="item.selfOperated" style="padding:0 4px;" size="default" color="error">自营</Tag><span>{{ item.storeName }}</span>
</div>
</div>
</div>

2
buyer/src/pages/payment/Pay.vue
View File

@ -412,7 +412,7 @@ export default {
});
this.$Modal.warning({
title: '以下商品超出配送区域' || title,
content: content.toString(),
content: content.toString()
});
}
if (res.result.memberAddress) {

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

@ -404,6 +404,7 @@ export default {
this.modalTitle = "添加文章";
this.treeValue = '';
this.form = {
sort: 1,
content:''
};
this.$refs.form.resetFields();

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

@ -146,7 +146,10 @@
<div>
<h4>订退单统计</h4>
<div class="breadcrumb" style="margin-bottom:20px;">
<span @click="clickTab(item,index)" :class="{'active':item.selected}" v-for="(item,index) in orderType" :key="index"> {{item.title}}</span>
<RadioGroup v-model="orderOrRefund" type="button" size="small" button-style="solid">
<Radio :label="true">订单</Radio>
<Radio :label="false">退单</Radio>
</RadioGroup>
</div>
<div>
<Table stripe :columns="columns" :data="data"></Table>
@ -173,17 +176,8 @@ export default {
data() {
return {
orderOrRefund: true, // 订单还是单
total: "0", // 总数
orderType: [ // 订单类型
{
title: "订单",
selected: true,
},
{
title: "退单",
selected: false,
},
],
// 订单状态
orderStatusList: {
UNDELIVERED: "待发货",
@ -459,20 +453,17 @@ export default {
},
deep: true,
},
orderOrRefund:{ // 订单还是退单
handler (val) {
if (val) {
this.getOrderList();
} else {
this.getOrderRefundList();
}
}
}
},
methods: {
clickTab(item, index) {
this.refundIndex = index;
this.orderType.forEach((res) => {
res.selected = false;
});
if (item.title == "退单") {
this.getOrderRefundList();
} else {
this.getOrderList();
}
item.selected = true;
},
// 订单图
initOrderChart() {
// 默认已经加载 legend-filter 交互

2
seller/package.json
View File

@ -30,7 +30,6 @@
"stompjs": "^2.3.3",
"swiper": "^6.3.5",
"uuid": "^8.3.2",
"view-design": "^4.2.0",
"vue": "^2.6.10",
"vue-awesome": "^4.0.2",
"vue-awesome-swiper": "^4.1.1",
@ -59,6 +58,7 @@
"less-loader": "^6.2.0",
"style-loader": "^2.0.0",
"style-resources-loader": "^1.3.2",
"view-design": "^4.6.1",
"vue-cli-plugin-style-resources-loader": "^0.1.4",
"vue-template-compiler": "^2.6.10"
}

2
seller/src/views/distribution/distributionGoods.vue
View File

@ -12,7 +12,7 @@
<Row class="operation padding-row">
<Button @click="add" type="primary">添加</Button>
</Row>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" @on-selection-change="changeSelect">
<Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" @on-selection-change="changeSelect">
<!-- 商品栏目格式化 -->
<template slot="goodsSlot" slot-scope="{row}">
<div style="margin-top: 5px;height: 70px; display: flex;">

1
seller/src/views/goods/goods-seller/draftGoods.vue
View File

@ -57,6 +57,7 @@
:columns="columns"
:data="data"
ref="table"
class="mt_10"
sortable="custom"
></Table>
<Row type="flex" justify="end" class="page">

4
seller/src/views/goods/goods-seller/goods.vue
View File

@ -41,7 +41,7 @@
</Dropdown>
</Row>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" @on-selection-change="changeSelect">
<Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" @on-selection-change="changeSelect">
<!-- 商品栏目格式化 -->
<template slot="goodsSlot" slot-scope="{row}">
<div style="margin-top: 5px;height: 90px; display: flex;">
@ -73,7 +73,7 @@
<Modal title="更新库存" v-model="updateStockModalVisible" :mask-closable="false" :width="500">
<Tabs value="updateStock">
<TabPane label="手动规格更新" name="updateStock">
<Table :columns="updateStockColumns" :data="stockList" border :span-method="handleSpan"></Table>
<Table class="mt_10" :columns="updateStockColumns" :data="stockList" border :span-method="handleSpan"></Table>
</TabPane>
<TabPane label="批量规格更新" name="stockAll">
<Input type="number" v-model="stockAllUpdate" placeholder="统一规格修改" />

2
seller/src/views/goods/goods-seller/goodsOperationSec.vue
View File

@ -137,7 +137,7 @@
规格详细
<div slot="content">
<div slot="content">
<Table :columns="skuTableColumn" :data="skuTableData" style="
<Table class="mt_10" :columns="skuTableColumn" :data="skuTableData" style="
width: 100%;
.ivu-table-overflowX {
overflow-x: hidden;

8
seller/src/views/message/message.vue
View File

@ -52,6 +52,7 @@
<transition name="view-message">
<div v-if="showMesTitleList" class="message-title-list-con">
<Table
class="mt_10"
ref="messageList"
:loading="loading"
:columns="mesTitleColumns"
@ -314,14 +315,17 @@
};
},
methods: {
// 改变页数
changePage(v) {
this.params.pageNumber = v;
this.refreshMessage();
},
// 改变页码
changePageSize(v) {
this.params.pageSize = v;
this.refreshMessage();
},
// 刷新消息
refreshMessage() {
let status = "UN_READY";
let type = this.currentMessageType;
@ -342,8 +346,6 @@
}
});
},
//获取全部数据
getAll() {
API_Index.getAllMessage(this.params).then(res => {
@ -359,6 +361,7 @@
}
});
},
// 删除消息
deleteMessage(id) {
API_Index.deleteMessage(id).then(res => {
if (res.success) {
@ -369,6 +372,7 @@
backMesTitleList() {
this.showMesTitleList = true;
},
// 设置当前消息分类
setCurrentMesType(type) {
if (this.currentMessageType !== type) {
this.showMesTitleList = true;

4
seller/src/views/my-components/lili/editor.vue
View File

@ -87,6 +87,7 @@ export default {
};
},
methods: {
// 初始化编辑器
initEditor() {
let that = this;
this.editor = new E(`#${this.id}`);
@ -171,16 +172,19 @@ export default {
}
this.editor.create();
},
// html预览
editHTML() {
this.dataEdit = this.data;
this.showHTMLModal = true;
},
// 保存
editHTMLOk() {
this.editor.txt.html(this.dataEdit);
this.$emit("input", this.data);
this.$emit("on-change", this.data);
this.showHTMLModal = false;
},
// 清空编辑器
clear() {
this.$Modal.confirm({
title: "确认清空",

3
seller/src/views/my-components/lili/set-password.vue
View File

@ -83,6 +83,7 @@ export default {
this.grade = grade;
return grade;
},
// 强度验证方法
strengthChange() {
if (!this.currentValue) {
this.tipStyle = "password-tip-none";
@ -108,11 +109,13 @@ export default {
this.strengthValue = 100;
}
},
// 输入框change事件
handleChange(v) {
this.strengthChange();
this.$emit("input", this.currentValue);
this.$emit("on-change", this.currentValue, this.grade, this.strength);
},
// 回显当前密码
setCurrentValue(value) {
if (value === this.currentValue) {
return;

22
seller/src/views/my-components/lili/upload-pic-input.vue
View File

@ -55,28 +55,28 @@ export default {
props: {
value: String,
size: String,
placeholder: {
placeholder: { // input提示信息
type: String,
default: "图片链接"
},
showInput: {
showInput: { // 显示图片链接
type: Boolean,
default: true
},
disabled: {
disabled: { // 是否不可选中
type: Boolean,
default: false
},
readonly: {
readonly: { // 是否只读
type: Boolean,
default: false
},
maxSize: {
maxSize: { // 图片最大尺寸
type: Number,
default: 5
},
maxlength: Number,
icon: {
maxlength: Number, // 最大长度
icon: { // 上传按钮图标
type: String,
default: "ios-cloud-upload-outline"
}
@ -91,11 +91,13 @@ export default {
};
},
methods: {
// 初始化
init() {
this.accessToken = {
accessToken: this.getStore("accessToken")
};
},
// 格式校验
handleFormatError(file) {
this.loading = false;
this.$Notice.warning({
@ -106,6 +108,7 @@ export default {
" ’格式不正确, 请选择 .jpg .jpeg .png .gif .bmp格式文件"
});
},
// 大小校验
handleMaxSize(file) {
this.loading = false;
this.$Notice.warning({
@ -113,10 +116,12 @@ export default {
desc: "所选文件‘ " + file.name + " ’大小过大, 不得超过 " + this.maxSize + "M."
});
},
// 上传前
beforeUpload() {
this.loading = true;
return true;
},
// 上传成功
handleSuccess(res, file) {
this.loading = false;
if (res.success) {
@ -127,15 +132,18 @@ export default {
this.$Message.error(res.message);
}
},
// 上传失败
handleError(error, file, fileList) {
this.loading = false;
this.$Message.error(error.toString());
},
// 上传成功回显
handleChange(v) {
this.$emit("input", this.currentValue);
this.$emit("on-change", this.currentValue);
this.$attrs.rollback && this.$attrs.rollback()
},
// 初始值
setCurrentValue(value) {
if (value === this.currentValue) {
return;

16
seller/src/views/my-components/lili/upload-pic-thumb.vue
View File

@ -63,34 +63,34 @@ export default {
vuedraggable
},
props: {
value: {
value: { // 默认值
type: Object
},
draggable: {
draggable: { // 是否可拖拽改变位置
type: Boolean,
default: true
},
multiple: {
multiple: { // 多选
type: Boolean,
default: true
},
maxSize: {
maxSize: { // 大小限制 MB
type: Number,
default: 5
},
disable:{
disable:{ // 禁止上传
type: Boolean,
default: false
},
remove:{
remove:{ // 移除图片
type: Boolean,
default: true
},
limit: {
limit: { // 上传总数限制
type: Number,
default: 10
},
isView: {
isView: { // 显示上传按钮
type: Boolean,
default: false
}

1
seller/src/views/order/after-order/orderComplaint.vue
View File

@ -41,6 +41,7 @@
border
:columns="columns"
:data="data"
class="mt_10"
ref="table"
sortable="custom"
@on-sort-change="changeSort"

1
seller/src/views/order/after-order/returnGoodsOrder.vue
View File

@ -49,6 +49,7 @@
<Table
:loading="loading"
border
class="mt_10"
:columns="columns"
:data="data"
ref="table"

1
seller/src/views/order/after-order/returnMoneyOrder.vue
View File

@ -49,6 +49,7 @@
<Table
:loading="loading"
border
class="mt_10"
:columns="columns"
:data="data"
ref="table"

2
seller/src/views/order/order/orderDetail.vue
View File

@ -107,7 +107,7 @@
</Card>
<Card>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom">
<Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom">
<!-- 商品栏目格式化 -->
<template slot="goodsSlot" slot-scope="{row}">
<div style="margin-top: 5px; height: 80px; display: flex">

2
seller/src/views/order/order/orderList.vue
View File

@ -42,7 +42,7 @@
</Button>
</download-excel>
</div>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table>
<Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table>
<Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
show-total show-elevator show-sizer></Page>

2
seller/src/views/order/order/virtualOrderList.vue
View File

@ -40,7 +40,7 @@
</Poptip>
</div>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
<Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
<Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
show-total show-elevator show-sizer></Page>

2
seller/src/views/order/receiptManager/receipt.vue
View File

@ -22,7 +22,7 @@
<Button @click="handleReset" class="search-btn">重置</Button>
</Form>
</Row>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
<Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
<!-- 订单详情格式化 -->
<template slot="orderSlot" slot-scope="scope">
<a @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>

2
seller/src/views/promotion/coupon/coupon.vue
View File

@ -26,7 +26,7 @@
<Button @click="delAll" class="ml_10">批量下架</Button>
<!-- <Button @click="upAll">批量上架</Button> -->
</Row>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
<Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
<template slot-scope="{ row }" slot="action">
<Button v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" type="info" size="small" style="margin-right: 10px" @click="edit(row)">编辑</Button>
<Button v-if="row.promotionStatus !== 'CLOSE'" type="error" size="small" @click="remove(row)">下架</Button>

2
seller/src/views/promotion/coupon/couponPublish.vue
View File

@ -62,7 +62,7 @@
<Button type="primary" @click="openSkuList">选择商品</Button>
<Button type="error" ghost style="margin-left: 10px" @click="delSelectGoods">批量删除</Button>
</div>
<Table border :columns="columns" :data="form.promotionGoodsList" @on-selection-change="changeSelect">
<Table class="mt_10" border :columns="columns" :data="form.promotionGoodsList" @on-selection-change="changeSelect">
<template slot-scope="{ row }" slot="QRCode">
<img :src="row.QRCode || '../../../assets/lili.png'" width="50px" height="50px" alt="" />
</template>

2
seller/src/views/promotion/live/liveGoods.vue
View File

@ -24,7 +24,7 @@
<div style="position:relative">
<Spin size="large" fix v-if="tableLoading">
</Spin>
<Table disabled-hover :columns="liveGoodsColumns" :data="liveGoodsData">
<Table class="mt_10" disabled-hover :columns="liveGoodsColumns" :data="liveGoodsData">
<template slot-scope="{ row }" slot="goodsName">
<div class="flex-goods">

2
seller/src/views/promotion/pintuan/pintuanGoods.vue
View File

@ -16,7 +16,7 @@
</Alert>
</Row>
<h3 class="act-goods">活动商品</h3>
<Table :loading="loading" border :columns="goodsColumns" :data="goodsData" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
<Table class="mt_10" :loading="loading" border :columns="goodsColumns" :data="goodsData" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
<template slot-scope="{ row, index }" slot="price">
<Input v-model="row.price" :disabled="status==='view'" @input="goodsData[index].price = row.price" />
</template>

1
seller/src/views/shop/bill/accountStatementBill.vue
View File

@ -37,6 +37,7 @@
<Table
:loading="loading"
border
class="mt_10"
:columns="columns"
:data="data"
ref="table"

137
seller/src/views/shop/bill/storeBill.vue
View File

@ -1,75 +1,72 @@
<template>
<div class="search">
<Row>
<Col>
<Card>
<Row @keydown.enter.native="handleSearch">
<Form
ref="searchForm"
:model="searchForm"
inline
:label-width="70"
class="search-form"
>
<Form-item label="开始时间" prop="startDay">
<DatePicker
type="date"
v-model="searchForm.startDate"
format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择"
clearable
style="width: 200px"
></DatePicker>
</Form-item>
<Form-item label="结束时间" prop="endDate">
<DatePicker
type="date"
v-model="searchForm.endDate"
format="yyyy-MM-dd HH:mm:ss"
di
placeholder="请选择"
clearable
style="width: 200px"
></DatePicker>
</Form-item>
<Form-item label="状态" prop="orderStatus">
<Select v-model="searchForm.billStatus" placeholder="请选择" clearable style="width: 200px">
<Option value="OUT">已出账</Option>
<Option value="CHECK">已对账</Option>
<Option value="COMPLETE">已完成</Option>
</Select>
</Form-item>
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
<Button @click="handleReset" class="search-btn">重置</Button>
</Form>
</Row>
<Table
:loading="loading"
border
:columns="columns"
:data="data"
ref="table"
sortable="custom"
@on-sort-change="changeSort"
@on-selection-change="changeSelect"
></Table>
<Row type="flex" justify="end" class="page">
<Page
:current="searchForm.pageNumber"
:total="total"
:page-size="searchForm.pageSize"
@on-change="changePage"
@on-page-size-change="changePageSize"
:page-size-opts="[10, 20, 50]"
size="small"
show-total
show-elevator
show-sizer
></Page>
</Row>
</Card>
</Col>
</Row>
<Card>
<Row @keydown.enter.native="handleSearch">
<Form
ref="searchForm"
:model="searchForm"
inline
:label-width="70"
class="search-form"
>
<Form-item label="开始时间" prop="startDay">
<DatePicker
type="date"
v-model="searchForm.startDate"
format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择"
clearable
style="width: 200px"
></DatePicker>
</Form-item>
<Form-item label="结束时间" prop="endDate">
<DatePicker
type="date"
v-model="searchForm.endDate"
format="yyyy-MM-dd HH:mm:ss"
di
placeholder="请选择"
clearable
style="width: 200px"
></DatePicker>
</Form-item>
<Form-item label="状态" prop="orderStatus">
<Select v-model="searchForm.billStatus" placeholder="请选择" clearable style="width: 200px">
<Option value="OUT">已出账</Option>
<Option value="CHECK">已对账</Option>
<Option value="COMPLETE">已完成</Option>
</Select>
</Form-item>
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
<Button @click="handleReset" class="search-btn">重置</Button>
</Form>
</Row>
<Table
:loading="loading"
border
:columns="columns"
:data="data"
ref="table"
class="mt_10"
sortable="custom"
@on-sort-change="changeSort"
@on-selection-change="changeSelect"
></Table>
<Row type="flex" justify="end" class="page">
<Page
:current="searchForm.pageNumber"
:total="total"
:page-size="searchForm.pageSize"
@on-change="changePage"
@on-page-size-change="changePageSize"
:page-size-opts="[10, 20, 50]"
size="small"
show-total
show-elevator
show-sizer
></Page>
</Row>
</Card>
</div>
</template>

38
seller/src/views/statistics/order.vue
View File

@ -144,7 +144,10 @@
<div>
<h4>订退单统计</h4>
<div class="breadcrumb" style="margin-bottom:20px;">
<span @click="clickTab(item,index)" :class="{'active':item.selected}" v-for="(item,index) in orderType" :key="index"> {{item.title}}</span>
<RadioGroup v-model="orderOrRefund" type="button" size="small" button-style="solid">
<Radio :label="true">订单</Radio>
<Radio :label="false">退单</Radio>
</RadioGroup>
</div>
<div>
<Table stripe :columns="columns" :data="data"></Table>
@ -168,18 +171,8 @@ export default {
data() {
return {
orderOrRefund: true, // 订单还是退单
total: "0", // 订单总数
orderType: [
// tab切换状态
{
title: "订单",
selected: true,
},
{
title: "退单",
selected: false,
},
],
// 订单状态
orderStatusList: {
UNDELIVERED: "待发货",
@ -460,20 +453,17 @@ export default {
},
deep: true,
},
orderOrRefund:{ // 订单还是退单
handler (val) {
if (val) {
this.getOrderList();
} else {
this.getOrderRefundList();
}
}
}
},
methods: {
clickTab(item, index) {
this.refundIndex = index;
this.orderType.forEach((res) => {
res.selected = false;
});
if (item.title == "退单") {
this.getOrderRefundList();
} else {
this.getOrderList();
}
item.selected = true;
},
// 订单图
initOrderChart() {
// 默认已经加载 legend-filter 交互