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

商家端添加注释，删除无用代码，优化样式

master
mabo 2021-07-19 18:03:35 +08:00
parent 07f41f5cb6
commit 5062cad2b0
40 changed files with 799 additions and 1573 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
seller/src/views/Main.vue
View File

@ -87,6 +87,7 @@ export default {
}, },
}, },
methods: { methods: {
// 初始化方法
init() { init() {
// 菜单 // 菜单
let pathArr = util.setCurrentPath(this, this.$route.name); let pathArr = util.setCurrentPath(this, this.$route.name);
@ -103,25 +104,7 @@ export default {
this.sliceNum = 2; this.sliceNum = 2;
} }
}, },
selectNav(name) { // 用户头像下拉
this.$store.commit("setCurrNav", name);
this.setStore("currNav", name);
// 清空所有已打开标签
// this.$store.commit("clearAllTags");
if (this.$route.name != "home_index") {
this.$router.push({
name: "home_index",
});
}
util.initRouter(this);
},
toggleClick() {
this.shrink = !this.shrink;
},
handleLanDropdown(name) {
this.$i18n.locale = name;
this.$store.commit("switchLang", name);
},
handleClickUserDropdown(name) { handleClickUserDropdown(name) {
if (name == "ownSpace") { if (name == "ownSpace") {
util.openNewPage(this, "personal-enter"); util.openNewPage(this, "personal-enter");
@ -142,6 +125,7 @@ export default {
this.$router.push({ path: "/login" }); this.$router.push({ path: "/login" });
} }
}, },
// 快捷页签选中状态
checkTag(name) { checkTag(name) {
let openpageHasTag = this.pageTagsList.some((item) => { let openpageHasTag = this.pageTagsList.some((item) => {
if (item.name == name) { if (item.name == name) {
@ -158,7 +142,7 @@ export default {
); );
} }
}, },
// 宽度变化
resize() { resize() {
let currWidth = document.body.clientWidth; let currWidth = document.body.clientWidth;
let count = currWidth / 300; let count = currWidth / 300;

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

@ -75,13 +75,11 @@
import * as API_Goods from "@/api/goods"; import * as API_Goods from "@/api/goods";
import TreeTable from "@/views/my-components/tree-table/Table/Table"; import TreeTable from "@/views/my-components/tree-table/Table/Table";
import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
export default { export default {
name: "lili-components", name: "lili-components",
components: { components: {
TreeTable, TreeTable
uploadPicInput
}, },
data() { data() {
return { return {

1
seller/src/views/lili-components/multiple-region.vue
View File

@ -191,7 +191,6 @@ export default {
this.selectedWay.push({ name: data.title, id: data.id }); this.selectedWay.push({ name: data.title, id: data.id });
}); });
console.log(this.data);
this.$store.state.regions = this.data; this.$store.state.regions = this.data;
} }
}); });

174
seller/src/views/my-components/map/index.vue
View File

@ -1,19 +1,23 @@
<template> <template>
<div class="map"> <div class="map">
<Modal <Modal v-model="showMap" title="选择地址" width="800">
v-model="showMap" <div class="address">{{ addrContent.address }}</div>
title="选择地址"
width="800"
>
<div class="address">{{addrContent.address}}</div>
<div id="map-container"></div> <div id="map-container"></div>
<div class="search-con"> <div class="search-con">
<Input placeholder="输入关键字搜索" id="input-map" v-model="mapSearch"/> <Input
placeholder="输入关键字搜索"
id="input-map"
v-model="mapSearch"
/>
<ul> <ul>
<li v-for="(tip, index) in tips" :key="index" @click="selectAddr(tip.location)"> <li
<p>{{tip.name}}</p> v-for="(tip, index) in tips"
<p>{{tip.district + tip.address}}</p> :key="index"
@click="selectAddr(tip.location)"
>
<p>{{ tip.name }}</p>
<p>{{ tip.district + tip.address }}</p>
</li> </li>
</ul> </ul>
</div> </div>
@ -25,49 +29,45 @@
</div> </div>
</template> </template>
<script> <script>
import AMapLoader from '@amap/amap-jsapi-loader'; import AMapLoader from "@amap/amap-jsapi-loader";
import {getRegion} from '@/api/common.js' import { getRegion } from "@/api/common.js";
export default { export default {
name:'map', name: "map",
data() { data() {
return { return {
showMap:false, // 地图显隐 showMap: false, // 地图显隐
mapSearch:'', // 地图搜索 mapSearch: "", // 地图搜索
map:null, // 初始化地图 map: null, // 初始化地图
autoComplete:null, // 初始化搜索方法 autoComplete: null, // 初始化搜索方法
geocoder:null, // 初始化地理、坐标转化 geocoder: null, // 初始化地理、坐标转化
positionPicker:null, // 地图拖拽选点 positionPicker: null, // 地图拖拽选点
tips:[], //搜索关键字列表 tips: [], //搜索关键字列表
addrContent:{}, // 回显地址信息 addrContent: {}, // 回显地址信息
loading:false, // 加载状态 loading: false, // 加载状态
}; };
}, },
watch:{ watch: {
mapSearch:function(val){ mapSearch: function (val) {
this.searchOfMap(val) this.searchOfMap(val);
} },
}, },
methods: { methods: {
ok(){ // 确定选择 ok() {
// 确定选择
this.loading = true this.loading = true;
const codeObj = {}
const params = { const params = {
cityCode: this.addrContent.regeocode.addressComponent.citycode, cityCode: this.addrContent.regeocode.addressComponent.citycode,
townName: this.addrContent.regeocode.addressComponent.township townName: this.addrContent.regeocode.addressComponent.township,
} };
getRegion(params).then(res=>{ getRegion(params).then((res) => {
if(res.success) { if (res.success) {
this.addrContent.addr = res.result.name.replace(/,/g," ") this.addrContent.addr = res.result.name.replace(/,/g, " ");
this.addrContent.addrId = res.result.id this.addrContent.addrId = res.result.id;
this.loading = false this.loading = false;
this.showMap = false; this.showMap = false;
this.$emit('getAddress',this.addrContent); this.$emit("getAddress", this.addrContent);
} }
}) });
}, },
init() { init() {
AMapLoader.load({ AMapLoader.load({
@ -78,17 +78,18 @@ methods: {
"AMap.Autocomplete", "AMap.Autocomplete",
"AMap.PlaceSearch", "AMap.PlaceSearch",
"AMap.Geolocation", "AMap.Geolocation",
'AMap.Geocoder' "AMap.Geocoder",
], // 需要使用的的插件列表，如比例尺'AMap.Scale'等 ], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
"AMapUI": { // 是否加载 AMapUI，缺省不加载 AMapUI: {
"version": '1.1', // AMapUI 缺省 1.1 // 是否加载 AMapUI，缺省不加载
"plugins":['misc/PositionPicker'], // 需要加载的 AMapUI ui插件 version: "1.1", // AMapUI 缺省 1.1
plugins: ["misc/PositionPicker"], // 需要加载的 AMapUI ui插件
}, },
}) })
.then((AMap) => { .then((AMap) => {
let that = this; let that = this;
this.map = new AMap.Map("map-container",{ this.map = new AMap.Map("map-container", {
zoom:12 zoom: 12,
}); });
that.map.addControl(new AMap.ToolBar()); that.map.addControl(new AMap.ToolBar());
that.map.addControl(new AMap.Autocomplete()); that.map.addControl(new AMap.Autocomplete());
@ -97,87 +98,88 @@ methods: {
// 实例化Autocomplete // 实例化Autocomplete
let autoOptions = { let autoOptions = {
city: "全国" city: "全国",
}; };
that.autoComplete = new AMap.Autocomplete(autoOptions); // 搜索 that.autoComplete = new AMap.Autocomplete(autoOptions); // 搜索
that.geocoder = new AMap.Geocoder(autoOptions) that.geocoder = new AMap.Geocoder(autoOptions);
that.positionPicker = new AMapUI.PositionPicker({
that.positionPicker = new AMapUI.PositionPicker({ // 拖拽选点 // 拖拽选点
mode: 'dragMap', mode: "dragMap",
map:that.map map: that.map,
}); });
that.positionPicker.start() that.positionPicker.start();
/** /**
* *
* 所有回显数据，都在positionResult里面 * 所有回显数据，都在positionResult里面
* 需要字段可以查找 * 需要字段可以查找
* *
*/ */
that.positionPicker.on('success', function(positionResult) { that.positionPicker.on("success", function (positionResult) {
that.addrContent = positionResult; that.addrContent = positionResult;
}); });
}) })
.catch((e) => {}); .catch((e) => {});
}, },
searchOfMap(val) { // 地图搜索 searchOfMap(val) {
// 地图搜索
let that = this; let that = this;
this.autoComplete.search(val, function (status, result) { this.autoComplete.search(val, function (status, result) {
// 搜索成功时，result即是对应的匹配数据 // 搜索成功时，result即是对应的匹配数据
if(status == 'complete' && result.info == 'OK'){ if (status == "complete" && result.info == "OK") {
that.tips = result.tips; that.tips = result.tips;
}else { } else {
that.tips = [] that.tips = [];
} }
}); });
}, },
selectAddr(location) { // 选择坐标 selectAddr(location) {
if(!location){ // 选择坐标
this.$Message.warning('请选择正确点位') if (!location) {
this.$Message.warning("请选择正确点位");
return false; return false;
} }
const lnglat = [location.lng,location.lat] const lnglat = [location.lng, location.lat];
this.positionPicker.start(lnglat) this.positionPicker.start(lnglat);
} },
}, },
mounted() { mounted() {
this.init() this.init();
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
#map-container{ #map-container {
width: 500px; width: 500px;
height: 400px; height: 400px;
} }
.search-con{ .search-con {
position: absolute; position: absolute;
right: 20px; right: 20px;
top: 64px; top: 64px;
width: 260px; width: 260px;
ul{ ul {
width: 260px; width: 260px;
height: 400px; height: 400px;
overflow: scroll; overflow: scroll;
li{ li {
padding: 5px; padding: 5px;
p:nth-child(2){ p:nth-child(2) {
color: #999; color: #999;
font-size: 12px; font-size: 12px;
} }
&:hover{ &:hover {
background-color:#eee; background-color: #eee;
cursor: pointer; cursor: pointer;
} }
} }
} }
} }
.address{ .address {
margin-bottom: 10px; margin-bottom: 10px;
// color: $theme_color; // color: $theme_color;
font-weight: bold; font-weight: bold;
} }
</style> </style>

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

@ -17,12 +17,12 @@
type="text" type="text"
v-model="searchForm.orderSn" v-model="searchForm.orderSn"
clearable clearable
placeholder="请输入商品名" placeholder="请输入订单号"
style="width: 200px" style="width: 200px"
/> />
</Form-item> </Form-item>
<Form-item label="状态" prop="status"> <Form-item label="状态" prop="status">
<Select v-model="searchForm.status" placeholder="请选择" clearable style="width: 200px"> <Select v-model="searchForm.status" placeholder="请选择订单状态" clearable style="width: 200px">
<Option value="NEW">新投诉</Option> <Option value="NEW">新投诉</Option>
<Option value="CANCEL">已撤销</Option> <Option value="CANCEL">已撤销</Option>
<Option value="WAIT_APPEAL">待申诉</Option> <Option value="WAIT_APPEAL">待申诉</Option>
@ -43,9 +43,6 @@
:data="data" :data="data"
class="mt_10" class="mt_10"
ref="table" ref="table"
sortable="custom"
@on-sort-change="changeSort"
@on-selection-change="changeSelect"
> >
<template slot-scope="{row}" slot="goodsName"> <template slot-scope="{row}" slot="goodsName">
<a class="mr_10" @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a> <a class="mr_10" @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
@ -72,56 +69,6 @@
></Page> ></Page>
</Row> </Row>
</Card> </Card>
<Modal
:title="modalTitle"
v-model="modalVisible"
:mask-closable="false"
:width="500"
>
<Form ref="form" :model="form" :label-width="100" :rules="formValidate">
<FormItem label="评价内容">
<span v-if="content == ''">暂无评价</span>
<span v-else>{{content}}</span>
</FormItem>
<FormItem label="评价图片">
<upload-pic-thumb
v-model="image"
:disable="true"
:remove="false"
></upload-pic-thumb>
</FormItem>
<FormItem label="回复内容" prop="reply">
<Input v-if="replyStatus == false"
v-model="form.reply"
type="textarea"
maxlength="200"
:rows="4"
clearable
style="width:260px"
/>
<span v-else>
{{form.reply}}
</span>
</FormItem>
<FormItem label="回复图片" prop="replyImage">
<upload-pic-thumb v-if="replyStatus == false"
v-model="form.replyImage"
:limit="5"
></upload-pic-thumb>
<upload-pic-thumb v-else
v-model="form.replyImage"
:disable="true"
:remove="false"
></upload-pic-thumb>
</FormItem>
</Form>
<div slot="footer">
<Button type="text" @click="modalVisible = false">取消</Button>
<Button v-if="replyStatus == false" type="primary" :loading="submitLoading" @click="handleSubmit" >回复
</Button
>
</div>
</Modal>
</div> </div>
</template> </template>
@ -137,14 +84,7 @@
}, },
data() { data() {
return { return {
image:[],//评价图片
replyStatus:false,//回复状态
modalType: 0, // 添加或编辑标识
modalVisible: false, // 添加或编辑显示
modalTitle: "", // 添加或编辑标题
openTip: true, // 显示提示
loading: true, // 表单加载状态 loading: true, // 表单加载状态
content: "",//评价内容
searchForm: { searchForm: {
// 搜索框初始化对象 // 搜索框初始化对象
pageNumber: 1, // 当前页数 pageNumber: 1, // 当前页数
@ -152,10 +92,6 @@
sort: "createTime", // 默认排序字段 sort: "createTime", // 默认排序字段
order: "desc", // 默认排序方式 order: "desc", // 默认排序方式
}, },
form: {}, // 表单数据
submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据
selectCount: 0, // 多选计数
columns: [ columns: [
// 表头 // 表头
{ {
@ -213,9 +149,8 @@
"Button", "Button",
{ {
props: { props: {
type: "primary", type: "info",
size: "small", size: "small"
icon: "ios-create-outline",
}, },
style: { style: {
marginRight: "5px", marginRight: "5px",
@ -236,8 +171,7 @@
{ {
props: { props: {
type: "primary", type: "primary",
size: "small", size: "small"
icon: "ios-create-outline",
}, },
style: { style: {
marginRight: "5px", marginRight: "5px",
@ -262,60 +196,34 @@
}; };
}, },
methods: { methods: {
// 初始化数据
init() { init() {
this.getDataList(); this.getDataList();
}, },
// 改变页码
changePage(v) { changePage(v) {
this.searchForm.pageNumber = v; this.searchForm.pageNumber = v;
this.getDataList(); this.getDataList();
this.clearSelectAll();
}, },
// 改变页数
changePageSize(v) { changePageSize(v) {
this.searchForm.pageSize = v; this.searchForm.pageSize = v;
this.getDataList(); this.getDataList();
}, },
// 搜索
handleSearch() { handleSearch() {
this.searchForm.pageNumber = 1; this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
// 重置
handleReset() { handleReset() {
this.searchForm = {} this.searchForm = {}
this.searchForm.pageNumber = 1; this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
changeSort(e) { // 获取数据
this.searchForm.sort = e.key;
this.searchForm.order = e.order;
if (e.order === "normal") {
this.searchForm.order = "";
}
this.getDataList();
},
clearSelectAll() {
this.$refs.table.selectAll(false);
},
changeSelect(e) {
this.selectList = e;
this.selectCount = e.length;
},
selectDateRange(v) {
if (v) {
this.searchForm.startDate = v[0];
this.searchForm.endDate = v[1];
}
},
dropDown() {
if (this.drop) {
this.dropDownContent = "展开";
this.dropDownIcon = "ios-arrow-down";
} else {
this.dropDownContent = "收起";
this.dropDownIcon = "ios-arrow-up";
}
this.drop = !this.drop;
},
getDataList() { getDataList() {
this.loading = true; this.loading = true;
API_Order.getComplainPage(this.searchForm).then((res) => { API_Order.getComplainPage(this.searchForm).then((res) => {
@ -328,21 +236,6 @@
this.total = this.data.length; this.total = this.data.length;
this.loading = false; this.loading = false;
}, },
//回复
handleSubmit() {
this.$refs.form.validate((valid) => {
if (valid) {
API_Member.replyMemberReview(this.form.id, this.form).then((res) => {
this.submitLoading = false;
if (res.success) {
this.$Message.success("回复成功");
this.getDataList();
this.modalVisible = false;
}
});
}
});
},
//投诉详情 //投诉详情
detail(v) { detail(v) {
let id = v.id; let id = v.id;

31
seller/src/views/order/after-order/orderComplaintDetail.vue
View File

@ -1,7 +1,5 @@
<template> <template>
<div class="search"> <div class="search">
<Row>
<Col>
<Card> <Card>
<div class="main-content"> <div class="main-content">
<div class="div-flow-left"> <div class="div-flow-left">
@ -38,7 +36,7 @@
暂无投诉凭证 暂无投诉凭证
</dd> </dd>
<dd v-else> <dd v-else>
<div class="div-img" v-for="(item, index) in images"> <div class="div-img" v-for="(item, index) in images" :key="index">
<img class="complain-img" :src=item> <img class="complain-img" :src=item>
</div> </div>
</dd> </dd>
@ -60,7 +58,7 @@
暂无申诉凭证 暂无申诉凭证
</dd> </dd>
<dd v-else> <dd v-else>
<div class="div-img" v-for="(item, index) in appealImages"> <div class="div-img" v-for="(item, index) in appealImages" :key="index">
<img class="complain-img" :src=item> <img class="complain-img" :src=item>
</div> </div>
</dd> </dd>
@ -100,9 +98,6 @@
<Modal title="View Image" v-model="visible"> <Modal title="View Image" v-model="visible">
<img :src="imgName" v-if="visible" style="width: 100%"> <img :src="imgName" v-if="visible" style="width: 100%">
</Modal> </Modal>
<!-- <Input v-model="appeal.appealImages" type="textarea" maxlength="200" :rows="4" clearable
style="width:260px"/> -->
</dd> </dd>
</dl> </dl>
<dl> <dl>
@ -121,7 +116,7 @@
<dt>对话记录</dt> <dt>对话记录</dt>
<dd> <dd>
<div class="div-content"> <div class="div-content">
<p v-for="(item, index) in complaintInfo.orderComplaintCommunications"> <p v-for="(item, index) in complaintInfo.orderComplaintCommunications" :key="index">
<span v-if="item.owner === 'STORE'">商家[{{ item.createTime }}]</span> <span v-if="item.owner === 'STORE'">商家[{{ item.createTime }}]</span>
<span v-if="item.owner === 'BUYER'">买家[{{ item.createTime }}]</span> <span v-if="item.owner === 'BUYER'">买家[{{ item.createTime }}]</span>
<span v-if="item.owner === 'PLATFORM'">平台[{{ item.createTime }}]</span> <span v-if="item.owner === 'PLATFORM'">平台[{{ item.createTime }}]</span>
@ -144,7 +139,7 @@
<Button type="primary" :loading="submitLoading" @click="handleSubmit" style="margin-left: 5px"> <Button type="primary" :loading="submitLoading" @click="handleSubmit" style="margin-left: 5px">
回复 回复
</Button> </Button>
<Button type="primary" :loading="submitLoading" @click="returnDataList" style="margin-left: 5px"> <Button type="default" :loading="submitLoading" @click="returnDataList" style="margin-left: 5px">
返回列表 返回列表
</Button> </Button>
</div> </div>
@ -236,22 +231,15 @@
</div> </div>
</div> </div>
</Card> </Card>
</Col>
</Row>
</div> </div>
</template> </template>
<script> <script>
import * as API_Order from "@/api/order"; import * as API_Order from "@/api/order";
import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
import * as API_GOODS from "@/api/goods"; import * as API_GOODS from "@/api/goods";
export default { export default {
name: "orderComplaint", name: "orderComplaint",
components: {
uploadPicThumb,
},
data() { data() {
return { return {
//展示图片层 //展示图片层
@ -284,15 +272,18 @@ export default {
}, },
}, },
methods: { methods: {
// 预览图片
handleView(name) { handleView(name) {
this.imgName = name; this.imgName = name;
this.visible = true; this.visible = true;
}, },
// 移除回复图片
handleRemove(file) { handleRemove(file) {
this.appeal.appealImages = this.appeal.appealImages.filter( this.appeal.appealImages = this.appeal.appealImages.filter(
(i) => i.url !== file.url (i) => i.url !== file.url
); );
}, },
// 上传成功回调
handleSuccessGoodsPicture(res, file) { handleSuccessGoodsPicture(res, file) {
if (file.response) { if (file.response) {
file.url = file.response.result; file.url = file.response.result;
@ -300,6 +291,7 @@ export default {
this.appeal.appealImages.push(file); this.appeal.appealImages.push(file);
} }
}, },
// 上传之前钩子
handleBeforeUpload() { handleBeforeUpload() {
const check = const check =
this.images.images !== undefined && this.images.images.length > 5; this.images.images !== undefined && this.images.images.length > 5;
@ -310,6 +302,7 @@ export default {
} }
return !check; return !check;
}, },
// 上传格式错误
handleFormatError(file) { handleFormatError(file) {
this.$Notice.warning({ this.$Notice.warning({
title: "图片格式不正确", title: "图片格式不正确",
@ -319,12 +312,14 @@ export default {
" is incorrect, please select jpg or png.", " is incorrect, please select jpg or png.",
}); });
}, },
// 上传大小限制
handleMaxSize(file) { handleMaxSize(file) {
this.$Notice.warning({ this.$Notice.warning({
title: "超过文件大小限制", title: "超过文件大小限制",
desc: "图片 " + file.name + " 不能超过2mb", desc: "图片 " + file.name + " 不能超过2mb",
}); });
}, },
// 获取详情
getDetail() { getDetail() {
this.loading = true; this.loading = true;
API_Order.getComplainDetail(this.id).then((res) => { API_Order.getComplainDetail(this.id).then((res) => {
@ -358,7 +353,7 @@ export default {
} }
}); });
}, },
//回复 //申诉
appealSubmit() { appealSubmit() {
if (this.appeal.appealContent === "") { if (this.appeal.appealContent === "") {
@ -376,7 +371,7 @@ export default {
}); });
}, },
}, },
mounted() { activated () {
this.id = this.$route.query.id; this.id = this.$route.query.id;
this.getDetail(); this.getDetail();
this.accessToken = { this.accessToken = {

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

@ -53,9 +53,6 @@
:columns="columns" :columns="columns"
:data="data" :data="data"
ref="table" ref="table"
sortable="custom"
@on-sort-change="changeSort"
@on-selection-change="changeSelect"
> >
<!-- 商品栏目格式化 --> <!-- 商品栏目格式化 -->
@ -121,19 +118,6 @@
goodsName:"" goodsName:""
}, },
selectDate: null, selectDate: null,
form: {
// 添加或编辑表单对象初始化数据
sn: "",
sellerName: "",
startTime: "",
endTime: "",
billPrice: "",
},
// 表单验证规则
formValidate: {},
submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据
selectCount: 0, // 多选计数
columns: [ columns: [
{ {
@ -236,33 +220,27 @@
}; };
}, },
methods: { methods: {
dropDown() { // 初始化数据
if (this.drop) {
this.dropDownContent = "展开";
this.dropDownIcon = "ios-arrow-down";
} else {
this.dropDownContent = "收起";
this.dropDownIcon = "ios-arrow-up";
}
this.drop = !this.drop;
},
init() { init() {
this.getDataList(); this.getDataList();
}, },
// 改变页码
changePage(v) { changePage(v) {
this.searchForm.pageNumber = v; this.searchForm.pageNumber = v;
this.getDataList(); this.getDataList();
this.clearSelectAll();
}, },
// 改变页数
changePageSize(v) { changePageSize(v) {
this.searchForm.pageSize = v; this.searchForm.pageSize = v;
this.getDataList(); this.getDataList();
}, },
// 搜索
handleSearch() { handleSearch() {
this.searchForm.pageNumber = 1; this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
// 重置
handleReset() { handleReset() {
this.searchForm = {}; this.searchForm = {};
this.selectDate = '' this.selectDate = ''
@ -270,28 +248,14 @@
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
// 范围时间选择格式化
changeSort(e) {
this.searchForm.sort = e.key;
this.searchForm.order = e.order;
if (e.order === "normal") {
this.searchForm.order = "";
}
this.getDataList();
},
clearSelectAll() {
this.$refs.table.selectAll(false);
},
changeSelect(e) {
this.selectList = e;
this.selectCount = e.length;
},
selectDateRange(v) { selectDateRange(v) {
if (v) { if (v) {
this.searchForm.startDate = v[0]; this.searchForm.startDate = v[0];
this.searchForm.endDate = v[1]; this.searchForm.endDate = v[1];
} }
}, },
// 获取列表数据
getDataList() { getDataList() {
this.loading = true; this.loading = true;
API_Order.afterSaleOrderPage(this.searchForm).then((res) => { API_Order.afterSaleOrderPage(this.searchForm).then((res) => {
@ -304,7 +268,7 @@
this.total = this.data.length; this.total = this.data.length;
this.loading = false; this.loading = false;
}, },
// 退货订单详情
detail(v) { detail(v) {
let sn = v.sn; let sn = v.sn;
this.$router.push({ this.$router.push({

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

@ -53,9 +53,6 @@
:columns="columns" :columns="columns"
:data="data" :data="data"
ref="table" ref="table"
sortable="custom"
@on-sort-change="changeSort"
@on-selection-change="changeSelect"
> >
<!-- 商品栏目格式化 --> <!-- 商品栏目格式化 -->
@ -103,7 +100,6 @@
export default { export default {
name: "returnMoneyOrder", name: "returnMoneyOrder",
components: {},
data() { data() {
return { return {
loading: true, // 表单加载状态 loading: true, // 表单加载状态
@ -121,19 +117,7 @@
goodsName:"" goodsName:""
}, },
selectDate: null, selectDate: null,
form: {
// 添加或编辑表单对象初始化数据
sn: "",
sellerName: "",
startTime: "",
endTime: "",
billPrice: "",
},
// 表单验证规则
formValidate: {},
submitLoading: false, // 添加或编辑提交状态 submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据
selectCount: 0, // 多选计数
columns: [ columns: [
// 表头 // 表头
{ {
@ -232,24 +216,27 @@
}; };
}, },
methods: { methods: {
// 初始化数据
init() { init() {
this.getDataList(); this.getDataList();
}, },
// 改变页码
changePage(v) { changePage(v) {
this.searchForm.pageNumber = v; this.searchForm.pageNumber = v;
this.getDataList(); this.getDataList();
this.clearSelectAll();
}, },
// 改变页数
changePageSize(v) { changePageSize(v) {
this.searchForm.pageSize = v; this.searchForm.pageSize = v;
this.getDataList(); this.getDataList();
}, },
// 搜索
handleSearch() { handleSearch() {
this.searchForm.pageNumber = 1; this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
// 重置
handleReset() { handleReset() {
this.selectDate = '' this.selectDate = ''
this.searchForm = {} this.searchForm = {}
@ -257,27 +244,14 @@
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
changeSort(e) { // 范围时间重新赋值
this.searchForm.sort = e.key;
this.searchForm.order = e.order;
if (e.order === "normal") {
this.searchForm.order = "";
}
this.getDataList();
},
clearSelectAll() {
this.$refs.table.selectAll(false);
},
changeSelect(e) {
this.selectList = e;
this.selectCount = e.length;
},
selectDateRange(v) { selectDateRange(v) {
if (v) { if (v) {
this.searchForm.startDate = v[0]; this.searchForm.startDate = v[0];
this.searchForm.endDate = v[1]; this.searchForm.endDate = v[1];
} }
}, },
// 获取列表数据
getDataList() { getDataList() {
this.loading = true; this.loading = true;
API_Order.afterSaleOrderPage(this.searchForm).then((res) => { API_Order.afterSaleOrderPage(this.searchForm).then((res) => {
@ -290,7 +264,7 @@
this.total = this.data.length; this.total = this.data.length;
this.loading = false; this.loading = false;
}, },
// 退款订单详情
detail(v) { detail(v) {
let sn = v.sn; let sn = v.sn;
this.$router.push({ this.$router.push({

60
seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
View File

@ -9,18 +9,9 @@
<h3>售后申请</h3> <h3>售后申请</h3>
<dl> <dl>
<dt>售后状态</dt> <dt>售后状态</dt>
<dd v-if="afterSaleInfo.serviceStatus =='APPLY'">申请售后</dd> <dd>{{filterStatus(afterSaleInfo.serviceStatus)}}</dd>
<dd v-if="afterSaleInfo.serviceStatus =='PASS'">申请通过</dd>
<dd v-if="afterSaleInfo.serviceStatus =='REFUSE'">申请拒绝</dd>
<dd v-if="afterSaleInfo.serviceStatus =='BUYER_RETURN'">买家退货，待卖家收货</dd>
<dd v-if="afterSaleInfo.serviceStatus =='SELLER_RE_DELIVERY'">商家换货</dd>
<dd v-if="afterSaleInfo.serviceStatus =='SELLER_CONFIRM'">卖家确认收货</dd>
<dd v-if="afterSaleInfo.serviceStatus =='SELLER_TERMINATION'">卖家终止售后</dd>
<dd v-if="afterSaleInfo.serviceStatus =='BUYER_CONFIRM'">买家确认收货</dd>
<dd v-if="afterSaleInfo.serviceStatus =='BUYER_CANCEL'">买家取消售后</dd>
<dd v-if="afterSaleInfo.serviceStatus =='WAIT_REFUND'">等待平台退款</dd>
<dd v-if="afterSaleInfo.serviceStatus =='COMPLETE'">已完成</dd>
</dl> </dl>
<dl> <dl>
<dt>退货退款编号</dt> <dt>退货退款编号</dt>
<dd>{{ afterSaleInfo.sn }}</dd> <dd>{{ afterSaleInfo.sn }}</dd>
@ -296,7 +287,7 @@
</div> </div>
<div slot="footer" style="text-align: right"> <div slot="footer" style="text-align: right">
<Button size="large" @click="orderDeliverCancel">取消</Button> <Button size="large" @click="modalVisible = false">取消</Button>
<Button type="success" size="large" @click="orderDeliverySubmit">发货</Button> <Button type="success" size="large" @click="orderDeliverySubmit">发货</Button>
</div> </div>
@ -337,7 +328,7 @@
</div> </div>
<div slot="footer" style="text-align: right"> <div slot="footer" style="text-align: right">
<Button @click="logisticsClose">取消</Button> <Button @click="logisticsModal = false">取消</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
@ -387,13 +378,24 @@ export default {
remark: "", remark: "",
actualRefundPrice: 0, actualRefundPrice: 0,
}, },
// 售后状态
afterSaleStatus: [
{status: 'APPLY', label: '申请售后'},
{status: 'PASS', label: '申请通过'},
{status: 'REFUSE', label: '申请拒绝'},
{status: 'BUYER_RETURN', label: '买家退货，待卖家收货'},
{status: 'SELLER_RE_DELIVERY', label: '商家换货'},
{status: 'SELLER_CONFIRM', label: '卖家确认收货'},
{status: 'SELLER_TERMINATION', label: '卖家终止售后'},
{status: 'BUYER_CONFIRM', label: '买家确认收货'},
{status: 'BUYER_CANCEL', label: '买家取消售后'},
{status: 'WAIT_REFUND', label: '等待平台退款'},
{status: 'COMPLETE', label: '已完成'},
]
}; };
}, },
watch: {
$route(to, from) {
},
},
methods: { methods: {
// 获取售后详情
getDetail() { getDetail() {
this.loading = true; this.loading = true;
API_Order.afterSaleOrderDetail(this.sn).then((res) => { API_Order.afterSaleOrderDetail(this.sn).then((res) => {
@ -415,9 +417,6 @@ export default {
} }
}); });
}, },
orderDeliverCancel() {
this.modalVisible = false;
},
//商家确认收货 //商家确认收货
sellerConfirmSubmit(type) { sellerConfirmSubmit(type) {
let title = "确认收货"; let title = "确认收货";
@ -463,10 +462,6 @@ export default {
} }
}); });
}, },
//关闭物流弹出框
logisticsClose() {
this.logisticsModal = false;
},
//换货发货 //换货发货
orderDeliverySubmit() { orderDeliverySubmit() {
@ -497,12 +492,23 @@ export default {
} }
}); });
}, },
// 返回售后状态中文描述
filterStatus (status) {
let label = ''
for (let i = 0; i< this.afterSaleStatus.length; i++) {
const obj = this.afterSaleStatus[i]
if (obj.status === status) {
label = obj.label
break;
}
}
return label
}
}, },
activated () {
mounted() {
this.sn = this.$route.query.sn; this.sn = this.$route.query.sn;
this.getDetail(); this.getDetail();
}, }
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

7
seller/src/views/order/order/exportOrderDeliver.vue
View File

@ -76,7 +76,6 @@ export default {
}, },
mounted() { mounted() {
this.accessToken.accessToken = this.getStore("accessToken"); this.accessToken.accessToken = this.getStore("accessToken");
console.log(this.accessToken.accessToken);
}, },
methods: { methods: {
// 点击选择步骤 // 点击选择步骤
@ -89,19 +88,19 @@ export default {
val.checked = true; val.checked = true;
} }
}, },
// 上传数据
handleUpload(file) { handleUpload(file) {
this.file = file; this.file = file;
this.upload(); this.upload();
return false; return false;
}, },
// 跳转订单列表
navigationToGoodsOrder() { navigationToGoodsOrder() {
this.$router.push({ this.$router.push({
path: "/order/orderList", path: "/order/orderList",
}); });
}, },
// 关闭页面
close() { close() {
this.$store.commit("removeTag", "export-order-deliver"); this.$store.commit("removeTag", "export-order-deliver");
localStorage.storeOpenedList = JSON.stringify( localStorage.storeOpenedList = JSON.stringify(

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

@ -5,7 +5,7 @@
<Button v-if="allowOperation.editPrice" @click="modifyPrice" type="primary">调整价格</Button> <Button v-if="allowOperation.editPrice" @click="modifyPrice" type="primary">调整价格</Button>
<Button v-if="allowOperation.editConsignee" @click="editAddress" type="primary">修改收货地址</Button> <Button v-if="allowOperation.editConsignee" @click="editAddress" type="primary">修改收货地址</Button>
<Button v-if="allowOperation.showLogistics" @click="logistics" type="primary">查看物流</Button> <Button v-if="allowOperation.showLogistics" @click="logistics" type="primary">查看物流</Button>
<Button @click="orderLog" type="primary">订单日志</Button> <Button @click="orderLogModal = true" type="primary">订单日志</Button>
<Button v-if="allowOperation.take" @click="orderTake" type="primary">订单核销</Button> <Button v-if="allowOperation.take" @click="orderTake" type="primary">订单核销</Button>
<Button v-if="allowOperation.ship" @click="orderDeliver" type="primary">发货</Button> <Button v-if="allowOperation.ship" @click="orderDeliver" type="primary">发货</Button>
</div> </div>
@ -242,7 +242,7 @@
</div> </div>
<div slot="footer" style="text-align: right"> <div slot="footer" style="text-align: right">
<Button @click="handelCancel">取消</Button> <Button @click="orderLogModal = false">取消</Button>
</div> </div>
</Modal> </Modal>
<!-- 查询物流 --> <!-- 查询物流 -->
@ -282,7 +282,7 @@
</div> </div>
<div slot="footer" style="text-align: right"> <div slot="footer" style="text-align: right">
<Button @click="logisticsClose">取消</Button> <Button @click="logisticsModal = false">取消</Button>
</div> </div>
</Modal> </Modal>
<!-- 订单发货 --> <!-- 订单发货 -->
@ -330,10 +330,8 @@ export default {
region: [], //地区 region: [], //地区
regionId: [], //地区id regionId: [], //地区id
showRegion: false, showRegion: false,
orderLogInfo: [], //订单日志数据
orderLogModal: false, //弹出调整价格框 orderLogModal: false, //弹出调整价格框
logisticsModal: false, //弹出查询物流框 logisticsModal: false, //弹出查询物流框
receiptModal: false, //开发票弹出框
orderDeliverModal: false, //订单发货弹出框 orderDeliverModal: false, //订单发货弹出框
orderTakeModal: false, //订单核销弹出框 orderTakeModal: false, //订单核销弹出框
checkedLogistics: [], //选中的物流公司集合 checkedLogistics: [], //选中的物流公司集合
@ -348,10 +346,6 @@ export default {
}, },
}, },
modal: false, //弹出调整价格框 modal: false, //弹出调整价格框
searchForm: {
pageNumber: 1, // 当前页数
pageSize: 100, // 页面大小
},
//调整价格表单 //调整价格表单
modifyPriceForm: { modifyPriceForm: {
orderPrice: 0, orderPrice: 0,
@ -488,7 +482,7 @@ export default {
}, },
}, },
], ],
data: [], // 表单数据 data: [], // 商品表单数据
orderLogColumns: [ orderLogColumns: [
// 表头 // 表头
{ {
@ -512,6 +506,7 @@ export default {
minWidth: 200, minWidth: 200,
}, },
], ],
// 订单日志数据
orderLogData: [], orderLogData: [],
}; };
}, },
@ -553,7 +548,7 @@ export default {
} }
}); });
}, },
// 修改订单金额
modifyPrice() { modifyPrice() {
//默认要修改的金额为订单总金额 //默认要修改的金额为订单总金额
this.modifyPriceForm.orderPrice = this.orderInfo.order.flowPrice; this.modifyPriceForm.orderPrice = this.orderInfo.order.flowPrice;
@ -589,10 +584,6 @@ export default {
} }
}); });
}, },
//关闭物流弹出框
logisticsClose() {
this.logisticsModal = false;
},
//订单发货 //订单发货
orderDeliver() { orderDeliver() {
API_Order.getLogisticsChecked().then((res) => { API_Order.getLogisticsChecked().then((res) => {
@ -606,27 +597,16 @@ export default {
orderDeliverySubmit() { orderDeliverySubmit() {
this.$refs.orderDeliveryForm.validate((valid) => { this.$refs.orderDeliveryForm.validate((valid) => {
if (valid) { if (valid) {
API_Order.orderDelivery(this.sn, this.orderDeliveryForm).then( API_Order.orderDelivery(this.sn, this.orderDeliveryForm).then((res) => {
(res) => {
if (res.success) { if (res.success) {
this.$Message.success("订单发货成功"); this.$Message.success("订单发货成功");
this.orderDeliverModal = false; this.orderDeliverModal = false;
this.getDataDetail(); this.getDataDetail();
} }
} });
);
} }
}); });
}, },
//订单日志
orderLog() {
this.orderLogModal = true;
},
//订单日志取消
handelCancel() {
this.orderLogModal = false;
},
//弹出修改收货地址框 //弹出修改收货地址框
editAddress() { editAddress() {
this.addressModal = true; this.addressModal = true;

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

@ -63,7 +63,6 @@ export default {
}, },
data() { data() {
return { return {
orderCode: "", // 虚拟订单核验码
loading: true, // 表单加载状态 loading: true, // 表单加载状态
searchForm: { searchForm: {
// 搜索框初始化对象 // 搜索框初始化对象
@ -79,15 +78,6 @@ export default {
orderType: "NORMAL", orderType: "NORMAL",
}, },
selectDate: null, selectDate: null,
form: {
// 添加或编辑表单对象初始化数据
sn: "",
sellerName: "",
startTime: "",
endTime: "",
billPrice: "",
},
submitLoading: false, // 添加或编辑提交状态
columns: [ columns: [
{ {
title: "订单号", title: "订单号",
@ -200,19 +190,6 @@ export default {
}; };
}, },
methods: { methods: {
/**
* 核验订单
*/
async orderVerification() {
let result = await verificationCode(this.orderCode);
if (result.success) {
this.$router.push({
name: "order-detail",
query: { sn: result.result.sn || this.orderCode },
});
}
},
/** /**
* 批量发货 * 批量发货
*/ */
@ -312,9 +289,6 @@ export default {
}); });
}, },
}, },
mounted() {
this.init();
},
activated() { activated() {
this.init(); this.init();
}, },

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

@ -56,7 +56,7 @@ export default {
name: "virtualOrderList", name: "virtualOrderList",
data() { data() {
return { return {
orderCode: "", orderCode: "", // 核验码
loading: true, // 表单加载状态 loading: true, // 表单加载状态
searchForm: { searchForm: {
// 搜索框初始化对象 // 搜索框初始化对象
@ -72,19 +72,6 @@ export default {
orderType: "VIRTUAL", orderType: "VIRTUAL",
}, },
selectDate: null, selectDate: null,
form: {
// 添加或编辑表单对象初始化数据
sn: "",
sellerName: "",
startTime: "",
endTime: "",
billPrice: "",
},
// 表单验证规则
formValidate: {},
submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据
selectCount: 0, // 多选计数
columns: [ columns: [
{ {
title: "订单号", title: "订单号",
@ -206,22 +193,27 @@ export default {
}); });
} }
}, },
// 初始化数据
init() { init() {
this.getDataList(); this.getDataList();
}, },
// 改变页码
changePage(v) { changePage(v) {
this.searchForm.pageNumber = v; this.searchForm.pageNumber = v;
this.getDataList(); this.getDataList();
}, },
// 改变页数
changePageSize(v) { changePageSize(v) {
this.searchForm.pageSize = v; this.searchForm.pageSize = v;
this.getDataList(); this.getDataList();
}, },
// 搜索
handleSearch() { handleSearch() {
this.searchForm.pageNumber = 1; this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
// 重置
handleReset() { handleReset() {
this.searchForm = {}; this.searchForm = {};
this.searchForm.pageNumber = 1; this.searchForm.pageNumber = 1;
@ -233,6 +225,7 @@ export default {
// 重新加载数据 // 重新加载数据
this.getDataList(); this.getDataList();
}, },
// 表格排序
changeSort(e) { changeSort(e) {
this.searchForm.sort = e.key; this.searchForm.sort = e.key;
this.searchForm.order = e.order; this.searchForm.order = e.order;
@ -241,17 +234,14 @@ export default {
} }
this.getDataList(); this.getDataList();
}, },
// 时间段重新赋值
changeSelect(e) {
this.selectList = e;
this.selectCount = e.length;
},
selectDateRange(v) { selectDateRange(v) {
if (v) { if (v) {
this.searchForm.startDate = v[0]; this.searchForm.startDate = v[0];
this.searchForm.endDate = v[1]; this.searchForm.endDate = v[1];
} }
}, },
// 获取商品列表
getDataList() { getDataList() {
this.loading = true; this.loading = true;
API_Order.getOrderList(this.searchForm).then((res) => { API_Order.getOrderList(this.searchForm).then((res) => {
@ -262,7 +252,7 @@ export default {
} }
}); });
}, },
// 跳转详情
detail(v) { detail(v) {
let sn = v.sn; let sn = v.sn;
this.$router.push({ this.$router.push({

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

@ -40,8 +40,7 @@
import * as API_Order from "@/api/order"; import * as API_Order from "@/api/order";
export default { export default {
name: "storeBill", name: "receipt",
components: {},
data() { data() {
return { return {
loading: true, // 表单加载状态 loading: true, // 表单加载状态
@ -53,19 +52,6 @@ export default {
order: "desc", // 默认排序方式 order: "desc", // 默认排序方式
receiptStatus: "", // 起始时间 receiptStatus: "", // 起始时间
}, },
form: {
// 添加或编辑表单对象初始化数据
sn: "",
sellerName: "",
startTime: "",
endTime: "",
billPrice: "",
},
// 表单验证规则
formValidate: {},
submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据
selectCount: 0, // 多选计数
columns: [ columns: [
{ {
title: "订单号", title: "订单号",
@ -213,50 +199,41 @@ export default {
}; };
}, },
methods: { methods: {
// 初始化数据
init() { init() {
this.getData(); this.getData();
}, },
// 改变页码
changePage(v) { changePage(v) {
this.searchForm.pageNumber = v; this.searchForm.pageNumber = v;
this.getData(); this.getData();
this.clearSelectAll();
}, },
// 改变页数
changePageSize(v) { changePageSize(v) {
this.searchForm.pageSize = v; this.searchForm.pageSize = v;
this.getData(); this.getData();
}, },
// 搜索
handleSearch() { handleSearch() {
this.searchForm.pageNumber = 1; this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getData(); this.getData();
}, },
// 重置搜索条件
handleReset() { handleReset() {
this.searchForm = {}; this.searchForm = {};
this.searchForm.pageNumber = 1; this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getData(); this.getData();
}, },
changeSort(e) { // 时间段从新赋值
this.searchForm.sort = e.key;
this.searchForm.order = e.order;
if (e.order === "normal") {
this.searchForm.order = "";
}
this.getData();
},
clearSelectAll() {
this.$refs.table.selectAll(false);
},
changeSelect(e) {
this.selectList = e;
this.selectCount = e.length;
},
selectDateRange(v) { selectDateRange(v) {
if (v) { if (v) {
this.searchForm.startDate = v[0]; this.searchForm.startDate = v[0];
this.searchForm.endDate = v[1]; this.searchForm.endDate = v[1];
} }
}, },
// 获取数据
getData() { getData() {
this.loading = true; this.loading = true;
API_Order.getReceiptPage(this.searchForm).then((res) => { API_Order.getReceiptPage(this.searchForm).then((res) => {
@ -287,9 +264,6 @@ export default {
}); });
}, },
}, },
mounted() {
this.init();
},
activated() { activated() {
this.init(); this.init();
}, },

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

@ -24,9 +24,8 @@
<Row class="operator padding-row"> <Row class="operator padding-row">
<Button @click="add" type="primary">添加</Button> <Button @click="add" type="primary">添加</Button>
<Button @click="delAll" class="ml_10">批量下架</Button> <Button @click="delAll" class="ml_10">批量下架</Button>
<!-- <Button @click="upAll">批量上架</Button> -->
</Row> </Row>
<Table class="mt_10" :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" @on-selection-change="changeSelect">
<template slot-scope="{ row }" slot="action"> <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 === '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> <Button v-if="row.promotionStatus !== 'CLOSE'" type="error" size="small" @click="remove(row)">下架</Button>
@ -55,17 +54,6 @@ export default {
sort: "startTime", // 默认排序字段 sort: "startTime", // 默认排序字段
order: "desc", // 默认排序方式 order: "desc", // 默认排序方式
}, },
form: {
// 添加或编辑表单对象初始化数据
promotionName: "",
},
// 表单验证规则
formValidate: {
promotionName: [
{ required: true, message: "不能为空", trigger: "blur" },
],
},
submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据 selectList: [], // 多选数据
selectCount: 0, // 多选计数 selectCount: 0, // 多选计数
columns: [ columns: [
@ -238,15 +226,6 @@ export default {
this.searchForm.pageNumber = 0; this.searchForm.pageNumber = 0;
this.getDataList(); this.getDataList();
}, },
changeSort(e) {
this.searchForm.sort = e.key;
this.searchForm.order = e.order;
if (e.order === "normal") {
this.searchForm.order = "";
}
this.getDataList();
},
clearSelectAll() { clearSelectAll() {
this.$refs.table.selectAll(false); this.$refs.table.selectAll(false);
}, },
@ -254,6 +233,7 @@ export default {
this.selectList = e; this.selectList = e;
this.selectCount = e.length; this.selectCount = e.length;
}, },
// 获取列表数据
getDataList() { getDataList() {
this.loading = true; this.loading = true;
if (this.selectDate && this.selectDate[0] && this.selectDate[1]) { if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
@ -263,7 +243,6 @@ export default {
this.searchForm.startTime = null; this.searchForm.startTime = null;
this.searchForm.endTime = null; this.searchForm.endTime = null;
} }
// 带多条件搜索参数获取表单数据 请自行修改接口
getShopCouponList(this.searchForm).then((res) => { getShopCouponList(this.searchForm).then((res) => {
this.loading = false; this.loading = false;
if (res.success) { if (res.success) {
@ -274,14 +253,14 @@ export default {
this.total = this.data.length; this.total = this.data.length;
this.loading = false; this.loading = false;
}, },
// 跳转编辑优惠券页面
edit(v) { edit(v) {
this.$router.push({ name: "add-coupon", query: { id: v.id } }); this.$router.push({ name: "add-coupon", query: { id: v.id } });
}, },
// 下架优惠券
remove(v) { remove(v) {
this.$Modal.confirm({ this.$Modal.confirm({
title: "确认下架", title: "确认下架",
// 记得确认修改此处
content: "确认要下架此优惠券么?", content: "确认要下架此优惠券么?",
loading: true, loading: true,
onOk: () => { onOk: () => {
@ -290,7 +269,6 @@ export default {
couponIds: v.id, couponIds: v.id,
promotionStatus: "CLOSE", promotionStatus: "CLOSE",
}; };
// 批量删除
updateCouponStatus(params).then((res) => { updateCouponStatus(params).then((res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {
@ -302,44 +280,15 @@ export default {
}, },
}); });
}, },
upAll() { // 批量下架
if (this.selectCount <= 0) {
this.$Message.warning("请选择要上架的优惠券");
return;
}
this.$Modal.confirm({
title: "确认上架",
content: "您确认要上架所选的 " + this.selectCount + " 条数据?",
loading: true,
onOk: () => {
let ids = [];
this.selectList.forEach(function (e) {
ids.push(e.id);
});
let params = {
couponIds: ids.toString(),
promotionStatus: "START",
};
// 批量上架
updateCouponStatus(params).then((res) => {
this.$Modal.remove();
if (res.success) {
this.$Message.success("上架成功");
this.clearSelectAll();
this.getDataList();
}
});
},
});
},
delAll() { delAll() {
if (this.selectCount <= 0) { if (this.selectCount <= 0) {
this.$Message.warning("您还未选择要作废的优惠券"); this.$Message.warning("您还未选择要下架的优惠券");
return; return;
} }
this.$Modal.confirm({ this.$Modal.confirm({
title: "确认作废", title: "确认下架",
content: "您确认要作废所选的 " + this.selectCount + " 条数据?", content: "您确认要下架所选的 " + this.selectCount + " 条数据?",
loading: true, loading: true,
onOk: () => { onOk: () => {
let ids = []; let ids = [];
@ -351,7 +300,6 @@ export default {
couponIds: ids.toString(), couponIds: ids.toString(),
promotionStatus: "CLOSE", promotionStatus: "CLOSE",
}; };
// 批量删除
updateCouponStatus(params).then((res) => { updateCouponStatus(params).then((res) => {
this.$Modal.remove(); this.$Modal.remove();
if (res.success) { if (res.success) {

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

@ -33,7 +33,7 @@
<FormItem label="发放数量" v-if="form.getType == 'FREE'" prop="publishNum"> <FormItem label="发放数量" v-if="form.getType == 'FREE'" prop="publishNum">
<Input v-model="form.publishNum" placeholder="发放数量" style="width: 260px" /> <Input v-model="form.publishNum" placeholder="发放数量" style="width: 260px" />
<div class="tips">如果发放数量为0时,则代表不限制发放数量</div> <span class="tips ml_10">如果发放数量为0时,则代表不限制发放数量</span>
</FormItem> </FormItem>
</div> </div>
<h4>使用限制</h4> <h4>使用限制</h4>
@ -43,7 +43,7 @@
</FormItem> </FormItem>
<FormItem label="领取限制" v-if="form.getType == 'FREE'" prop="couponLimitNum"> <FormItem label="领取限制" v-if="form.getType == 'FREE'" prop="couponLimitNum">
<Input v-model="form.couponLimitNum" placeholder="领取限制" clearable style="width: 260px" /> <Input v-model="form.couponLimitNum" placeholder="领取限制" clearable style="width: 260px" />
<div class="tips">如果领取限制为0时,则代表不限制领取数量</div> <span class="tips ml_10">如果领取限制为0时,则代表不限制领取数量</span>
</FormItem> </FormItem>
<FormItem label="有效期" prop="rangeTime"> <FormItem label="有效期" prop="rangeTime">
<DatePicker type="datetimerange" v-model="form.rangeTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择" :options="options" style="width: 260px"> <DatePicker type="datetimerange" v-model="form.rangeTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择" :options="options" style="width: 260px">
@ -125,7 +125,6 @@ export default {
return { return {
modalType: 0, // 判断是新增还是编辑优惠券 0 新增 1 编辑 modalType: 0, // 判断是新增还是编辑优惠券 0 新增 1 编辑
categoryId: 0, // 分类id
form: { form: {
/** 店铺承担比例 */ /** 店铺承担比例 */
sellerCommission: 0, sellerCommission: 0,
@ -148,12 +147,6 @@ export default {
submitLoading: false, // 添加或编辑提交状态 submitLoading: false, // 添加或编辑提交状态
selectedGoods: [], // 已选商品列表，便于删除 selectedGoods: [], // 已选商品列表，便于删除
goodsCategoryList: [], // 商品分类列表 goodsCategoryList: [], // 商品分类列表
shopCategoryList: [], // 店铺分类列表
cascaderProps: {
multiple: true,
label: "name",
value: "id",
}, // 级联选择器配置项
formRule: { formRule: {
promotionName: [{ required: true, message: "活动名称不能为空" }], promotionName: [{ required: true, message: "活动名称不能为空" }],
couponName: [{ required: true, message: "优惠券名称不能为空" }], couponName: [{ required: true, message: "优惠券名称不能为空" }],
@ -241,6 +234,7 @@ export default {
}, },
}, },
], ],
// 时间选择器可选范围
options: { options: {
disabledDate(date) { disabledDate(date) {
return date && date.valueOf() < Date.now() - 86400000; return date && date.valueOf() < Date.now() - 86400000;
@ -257,6 +251,7 @@ export default {
} }
}, },
methods: { methods: {
// 获取回显数据
getCoupon() { getCoupon() {
getShopCoupon(this.id).then((res) => { getShopCoupon(this.id).then((res) => {
let data = res.result; let data = res.result;
@ -292,7 +287,7 @@ export default {
this.form = data; this.form = data;
}); });
}, },
/** 保存平台优惠券 */ /** 保存优惠券 */
handleSubmit() { handleSubmit() {
this.$refs.form.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {

21
seller/src/views/promotion/fullCut/fullCut.vue
View File

@ -1,7 +1,6 @@
<template> <template>
<div class="full-cut"> <div class="full-cut">
<Card> <Card>
<Row>
<Form <Form
ref="searchForm" ref="searchForm"
:model="searchForm" :model="searchForm"
@ -40,10 +39,11 @@
style="width: 200px" style="width: 200px"
></DatePicker> ></DatePicker>
</Form-item> </Form-item>
<Button @click="handleSearch" type="primary" class="search-btn" icon="ios-search">搜索</Button> <Form-item>
<Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
<Button @click="handleReset" class="ml_10">重置</Button> <Button @click="handleReset" class="ml_10">重置</Button>
</Form-item>
</Form> </Form>
</Row>
<Row class="operation"> <Row class="operation">
<Button type="primary" @click="newAct">新增</Button> <Button type="primary" @click="newAct">新增</Button>
</Row> </Row>
@ -184,29 +184,31 @@ export default {
}; };
}, },
methods: { methods: {
// 改变页码
newAct() { newAct() {
// 新增活动
this.$router.push({ name: "full-cut-detail" }); this.$router.push({ name: "full-cut-detail" });
}, },
// 初始化数据
init() { init() {
this.getDataList(); this.getDataList();
}, },
changePage(v) {
// 改变页数 // 改变页数
changePage(v) {
this.searchForm.pageNumber = v - 1; this.searchForm.pageNumber = v - 1;
this.getDataList(); this.getDataList();
}, },
changePageSize(v) {
// 改变页码 // 改变页码
changePageSize(v) {
this.searchForm.pageSize = v; this.searchForm.pageSize = v;
this.getDataList(); this.getDataList();
}, },
handleSearch() {
// 搜索 // 搜索
handleSearch() {
this.searchForm.pageNumber = 0; this.searchForm.pageNumber = 0;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
// 重置
handleReset() { handleReset() {
this.selectDate = '' this.selectDate = ''
this.searchForm = {} this.searchForm = {}
@ -214,11 +216,11 @@ export default {
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
edit(row) {
// 编辑 // 编辑
edit(row) {
this.$router.push({ name: "full-cut-detail", query: { id: row.id } }); this.$router.push({ name: "full-cut-detail", query: { id: row.id } });
}, },
// 删除
del(row) { del(row) {
this.$Modal.confirm({ this.$Modal.confirm({
title: "提示", title: "提示",
@ -237,6 +239,7 @@ export default {
}, },
}); });
}, },
// 获取列表数据
getDataList() { getDataList() {
this.loading = true; this.loading = true;
if (this.selectDate && this.selectDate[0] && this.selectDate[1]) { if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {

2
seller/src/views/promotion/fullCut/newFullCut.vue
View File

@ -259,7 +259,7 @@ import skuSelect from "@/views/lili-dialog";
export default { export default {
name: "addFullCut", name: "addFullCut",
components: { components: {
skuSelect, skuSelect
}, },
data() { data() {
const checkPrice = (rule, value, callback) => { const checkPrice = (rule, value, callback) => {

8
seller/src/views/promotion/live/addLive.vue
View File

@ -131,7 +131,6 @@
<FormItem> <FormItem>
<Button type="primary" v-if="liveStatus=='NEW'" @click="createLives()">保存</Button> <Button type="primary" v-if="liveStatus=='NEW'" @click="createLives()">保存</Button>
</FormItem> </FormItem>
</Form> </Form>
</Card> </Card>
@ -162,7 +161,7 @@ export default {
}, },
data() { data() {
return { return {
spinShow: false, spinShow: false, // loading加载
liveGoodsVisible: false, //选择商品 liveGoodsVisible: false, //选择商品
imageVisible: false, //查看图片的dailog imageVisible: false, //查看图片的dailog
imageSrc: "", //查看图片的路径 imageSrc: "", //查看图片的路径
@ -172,7 +171,6 @@ export default {
// 不能选择今天以前的时间 // 不能选择今天以前的时间
optionsTime: { optionsTime: {
disabledDate(date) { disabledDate(date) {
// console.log(data)
return date && date.valueOf() < Date.now() - 86400000; return date && date.valueOf() < Date.now() - 86400000;
}, },
}, },
@ -237,8 +235,7 @@ export default {
width: 250, width: 250,
}, },
], ],
liveData: [], //直播商品集合 liveData: [] //直播商品集合
commodityList: "", //商品集合
}; };
}, },
mounted() { mounted() {
@ -285,7 +282,6 @@ export default {
// 将选择的商品回调给表格 // 将选择的商品回调给表格
this.liveData = data.commodityList; this.liveData = data.commodityList;
this.commodityList = data.commodityList;
// 将时间格式化 // 将时间格式化
this.$set( this.$set(

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

@ -40,7 +40,7 @@ export default {
data() { data() {
return { return {
// 查询数据的总数 // 查询数据的总数
total: "", total: 0,
// 查询的form // 查询的form
searchForm: { searchForm: {
pageSize: 10, pageSize: 10,

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

@ -144,6 +144,7 @@ export default {
], ],
// 表格商品详情 // 表格商品详情
liveGoodsData: [], liveGoodsData: [],
// 已选商品
selectedGoods: [], selectedGoods: [],
}; };
}, },
@ -208,18 +209,6 @@ export default {
* 回调参数补充 * 回调参数补充
*/ */
selectedLiveGoods(val, index) { selectedLiveGoods(val, index) {
// if (!val.___selected) {
// val.___selected = true;
// this.$set(this.liveGoodsData[index], "___selected", true);
// this.selectedGoods.push(this.liveGoodsData[index]);
// } else {
// this.$nextTick(() => {
// val.___selected = false;
// this.$set(this.liveGoodsData[index], "___selected", true);
// this.selectedGoods.splice(index, 1);
// });
// }
this.$emit("selectedGoods", val); this.$emit("selectedGoods", val);
}, },

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

@ -130,6 +130,7 @@ export default {
); );
this.$router.go(-1); this.$router.go(-1);
}, },
// 提交活动
handleSubmit() { handleSubmit() {
this.$refs.form.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
@ -167,6 +168,7 @@ export default {
} }
}); });
}, },
// 获取详情
getDetail() { getDetail() {
getPintuanDetail(this.id).then((res) => { getPintuanDetail(this.id).then((res) => {
if (res.success) { if (res.success) {

11
seller/src/views/promotion/pintuan/pintuan.scss
View File

@ -1,11 +0,0 @@
.search {
.operation {
margin-bottom: 2vh;
}
.page {
margin-top: 2vh;
}
}
.row {
margin-bottom: 5px;
}

32
seller/src/views/promotion/pintuan/pintuan.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="search"> <div class="pintuan">
<Card> <Card>
<Row> <Row>
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
@ -47,9 +47,6 @@
:columns="columns" :columns="columns"
:data="data" :data="data"
ref="table" ref="table"
sortable="custom"
@on-sort-change="changeSort"
@on-selection-change="changeSelect"
> >
<template slot-scope="{ row }" slot="action"> <template slot-scope="{ row }" slot="action">
<div class="row"> <div class="row">
@ -128,7 +125,6 @@ import {
} from "@/api/promotion"; } from "@/api/promotion";
export default { export default {
name: "pintuan", name: "pintuan",
components: {},
data() { data() {
return { return {
loading: true, // 表单加载状态 loading: true, // 表单加载状态
@ -140,8 +136,6 @@ export default {
order: "desc", // 默认排序方式 order: "desc", // 默认排序方式
}, },
selectDate: null, // 选择的时间 selectDate: null, // 选择的时间
selectList: [], // 多选数据
selectCount: 0, // 多选计数
columns: [ columns: [
{ {
title: "活动名称", title: "活动名称",
@ -191,23 +185,27 @@ export default {
}; };
}, },
methods: { methods: {
// 初始化数据
init() { init() {
this.getDataList(); this.getDataList();
}, },
// 改变页码
changePage(v) { changePage(v) {
this.searchForm.pageNumber = v - 1; this.searchForm.pageNumber = v - 1;
this.getDataList(); this.getDataList();
this.clearSelectAll();
}, },
// 改变页数
changePageSize(v) { changePageSize(v) {
this.searchForm.pageSize = v; this.searchForm.pageSize = v;
this.getDataList(); this.getDataList();
}, },
// 搜索
handleSearch() { handleSearch() {
this.searchForm.pageNumber = 0; this.searchForm.pageNumber = 0;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
// 重置
handleReset() { handleReset() {
this.searchForm = {} this.searchForm = {}
this.selectDate = '' this.selectDate = ''
@ -215,20 +213,14 @@ export default {
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
// 时间段分别赋值
clearSelectAll() {
this.$refs.table.selectAll(false);
},
changeSelect(e) {
this.selectList = e;
this.selectCount = e.length;
},
selectDateRange(v) { selectDateRange(v) {
if (v) { if (v) {
this.searchForm.startDate = v[0]; this.searchForm.startDate = v[0];
this.searchForm.endDate = v[1]; this.searchForm.endDate = v[1];
} }
}, },
// 获取列表数据
getDataList() { getDataList() {
this.loading = true; this.loading = true;
if (this.selectDate && this.selectDate[0] && this.selectDate[1]) { if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
@ -238,7 +230,6 @@ export default {
this.searchForm.startTime = null; this.searchForm.startTime = null;
this.searchForm.endTime = null; this.searchForm.endTime = null;
} }
// 带多条件搜索参数获取表单数据 请自行修改接口
getPintuanList(this.searchForm).then((res) => { getPintuanList(this.searchForm).then((res) => {
this.loading = false; this.loading = false;
if (res.success) { if (res.success) {
@ -247,15 +238,19 @@ export default {
} }
}); });
}, },
// 新建拼团
newAct() { newAct() {
this.$router.push({ name: "new-pintuan" }); this.$router.push({ name: "new-pintuan" });
}, },
// 编辑拼团
edit(v) { edit(v) {
this.$router.push({ name: "new-pintuan", query: { id: v.id } }); this.$router.push({ name: "new-pintuan", query: { id: v.id } });
}, },
// 管理拼团商品
manage(v, status) { manage(v, status) {
this.$router.push({ name: "pintuan-goods", query: { id: v.id, status: status } }); this.$router.push({ name: "pintuan-goods", query: { id: v.id, status: status } });
}, },
// 手动开启拼团活动
open(v) { open(v) {
this.$Modal.confirm({ this.$Modal.confirm({
title: "确认开启", title: "确认开启",
@ -298,6 +293,7 @@ export default {
}, },
}); });
}, },
// 关闭拼团活动
close(v) { close(v) {
this.$Modal.confirm({ this.$Modal.confirm({
title: "确认关闭", title: "确认关闭",
@ -314,6 +310,7 @@ export default {
}, },
}); });
}, },
// 删除拼团活动
remove(v) { remove(v) {
this.$Modal.confirm({ this.$Modal.confirm({
title: "确认删除", title: "确认删除",
@ -338,6 +335,5 @@ export default {
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
@import "pintuan.scss";
@import "@/styles/table-common.scss"; @import "@/styles/table-common.scss";
</style> </style>

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

@ -146,6 +146,7 @@ export default {
); );
this.$router.go(-1); this.$router.go(-1);
}, },
// 保存商品
save() { save() {
if (this.goodsData.length == 0) { if (this.goodsData.length == 0) {
this.$Modal.warning({ title: "提示", content: "请选择活动商品" }); this.$Modal.warning({ title: "提示", content: "请选择活动商品" });
@ -203,8 +204,6 @@ export default {
this.searchForm.pageNumber = 0; this.searchForm.pageNumber = 0;
this.searchForm.promotionName = ""; this.searchForm.promotionName = "";
this.selectDate = null; this.selectDate = null;
// 重新加载数据
this.getDataList(); this.getDataList();
}, },
@ -229,7 +228,6 @@ export default {
} }
}); });
}, },
getPintuanMsg() { // 获取拼团详情 getPintuanMsg() { // 获取拼团详情
getPintuanDetail(this.$route.query.id).then((res) => { getPintuanDetail(this.$route.query.id).then((res) => {
if (res.success) this.data.push(res.result); if (res.success) this.data.push(res.result);

14
seller/src/views/promotion/seckill/seckill.vue
View File

@ -28,6 +28,7 @@
:columns="columns" :columns="columns"
:data="data" :data="data"
ref="table" ref="table"
class="mt_10"
sortable="custom" sortable="custom"
> >
<template slot-scope="{ row }" slot="applyEndTime"> <template slot-scope="{ row }" slot="applyEndTime">
@ -141,22 +142,27 @@ export default {
}; };
}, },
methods: { methods: {
// 初始化数据
init() { init() {
this.getDataList(); this.getDataList();
}, },
// 分页 改变页码
changePage(v) { changePage(v) {
this.searchForm.pageNumber = v - 1; this.searchForm.pageNumber = v - 1;
this.getDataList(); this.getDataList();
}, },
// 分页 改变页数
changePageSize(v) { changePageSize(v) {
this.searchForm.pageSize = v; this.searchForm.pageSize = v;
this.getDataList(); this.getDataList();
}, },
// 搜索
handleSearch() { handleSearch() {
this.searchForm.pageNumber = 0; this.searchForm.pageNumber = 0;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
// 重置
handleReset() { handleReset() {
this.searchForm = {}; this.searchForm = {};
this.selectDate = ""; this.selectDate = "";
@ -164,10 +170,11 @@ export default {
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
// 管理
manage(row) { manage(row) {
this.$router.push({ name: "seckill-goods", query: { id: row.id } }); this.$router.push({ name: "seckill-goods", query: { id: row.id } });
}, },
// 获取列表数据
getDataList() { getDataList() {
this.loading = true; this.loading = true;
if (this.selectDate && this.selectDate[0] && this.selectDate[1]) { if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
@ -201,10 +208,7 @@ export default {
}, },
activated() { activated() {
this.init(); this.init();
}, }
mounted() {
this.init();
},
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

49
seller/src/views/promotion/seckill/seckillGoods.vue
View File

@ -16,11 +16,6 @@
<Button @click="delAll">批量删除</Button> <Button @click="delAll">批量删除</Button>
</template> </template>
</Row> </Row>
<Row v-show="openTip" v-if="promotionStatus == 'NEW'">
<Alert show-icon>
已选择 <span class="select-count">{{ selectCount }}</span> 项
</Alert>
</Row>
<Row class="operation"> <Row class="operation">
<Tabs type="card" v-model="tabIndex"> <Tabs type="card" v-model="tabIndex">
<TabPane <TabPane
@ -136,7 +131,6 @@ import {
seckillGoodsList, seckillGoodsList,
seckillDetail, seckillDetail,
setSeckillGoods, setSeckillGoods,
removeSeckillGoods,
} from "@/api/promotion.js"; } from "@/api/promotion.js";
import skuSelect from "@/views/lili-dialog"; import skuSelect from "@/views/lili-dialog";
export default { export default {
@ -146,7 +140,6 @@ export default {
data() { data() {
return { return {
promotionStatus: "", // 活动状态 promotionStatus: "", // 活动状态
openTip: true,
loading: false, // 表单加载状态 loading: false, // 表单加载状态
searchForm: { searchForm: {
// 搜索框初始化对象 // 搜索框初始化对象
@ -204,10 +197,6 @@ export default {
slot: "promotionApplyStatus", slot: "promotionApplyStatus",
minWidth: 30, minWidth: 30,
}, },
// {
// title: "商品二维码",
// slot: "QRCode",
// },
{ {
title: "操作", title: "操作",
slot: "action", slot: "action",
@ -217,7 +206,6 @@ export default {
goodsList: [] // 商品列表 goodsList: [] // 商品列表
}; };
}, },
computed: {},
methods: { methods: {
// 关闭当前页面 // 关闭当前页面
closeCurrentPage() { closeCurrentPage() {
@ -227,18 +215,8 @@ export default {
); );
this.$router.go(-1); this.$router.go(-1);
}, },
// 提交秒杀商品
save() { save() {
// 提交
// for(let i=0;i<this.goodsData.length;i++){
// let data = this.goodsData[i]
// if(!data.price){
// this.$Modal.warning({
// title:'提示',
// content:`请填写【${data.goodsName}】的价格`
// })
// return
// }
// }
let list = JSON.parse(JSON.stringify(this.goodsList)); let list = JSON.parse(JSON.stringify(this.goodsList));
let params = { let params = {
@ -260,10 +238,11 @@ export default {
} }
}); });
}, },
// 初始化数据
init() { init() {
this.getSeckillMsg(); this.getSeckillMsg();
}, },
// 清除选中状态
clearSelectAll() { clearSelectAll() {
this.$refs.table.selectAll(false); this.$refs.table.selectAll(false);
}, },
@ -316,19 +295,10 @@ export default {
} }
}); });
}, },
delGoods(index, id) { delGoods(index) {
// 删除商品 // 删除商品
// if (id) {
// removeSeckillGoods(this.$route.query.id, id).then((res) => {
// if (res.success) {
// this.goodsList[this.tabIndex].list.splice(index, 1);
// this.$Message.success("删除成功！");
// }
// });
// } else {
this.goodsList[this.tabIndex].list.splice(index, 1); this.goodsList[this.tabIndex].list.splice(index, 1);
this.$Message.success("删除成功！"); this.$Message.success("删除成功！");
// }
}, },
delAll() { // 删除当前时段全部数据 delAll() { // 删除当前时段全部数据
if (this.selectCount <= 0) { if (this.selectCount <= 0) {
@ -350,11 +320,6 @@ export default {
].list.filter((item) => { ].list.filter((item) => {
return !ids.includes(item.id); return !ids.includes(item.id);
}); });
// removeSeckillGoods(this.$route.query.id, ids).then((res) => {
// if (res.success) {
// this.$Message.success("删除成功！");
// }
// });
}, },
}); });
}, },
@ -406,22 +371,20 @@ export default {
} }
return []; return [];
}, },
// 格式化申请状态
promotionApplyStatus(key) { promotionApplyStatus(key) {
switch (key) { switch (key) {
case "APPLY": case "APPLY":
return "申请"; return "申请";
break;
case "PASS": case "PASS":
return "通过"; return "通过";
break;
case "REFUSE": case "REFUSE":
return "拒绝"; return "拒绝";
break;
default: default:
return "未申请"; return "未申请";
break;
} }
}, },
// 展示审核拒绝原因
showReason(reason) { showReason(reason) {
this.$Modal.info({ this.$Modal.info({
title: "拒绝原因", title: "拒绝原因",

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

@ -30,7 +30,7 @@
style="width: 200px" style="width: 200px"
></DatePicker> ></DatePicker>
</Form-item> </Form-item>
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button> <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
<Button @click="handleReset" class="search-btn">重置</Button> <Button @click="handleReset" class="search-btn">重置</Button>
</Form> </Form>
</Row> </Row>
@ -41,9 +41,6 @@
:columns="columns" :columns="columns"
:data="data" :data="data"
ref="table" ref="table"
sortable="custom"
@on-sort-change="changeSort"
@on-selection-change="changeSelect"
></Table> ></Table>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
@ -68,7 +65,6 @@
export default { export default {
name: "accountStatementBill", name: "accountStatementBill",
components: {},
data() { data() {
return { return {
loading: true, // 表单加载状态 loading: true, // 表单加载状态
@ -81,25 +77,13 @@
startDate: "", // 起始时间 startDate: "", // 起始时间
endDate: "", // 终止时间 endDate: "", // 终止时间
}, },
form: {
// 添加或编辑表单对象初始化数据
sn: "",
sellerName: "",
startTime: "",
endTime: "",
billPrice: "",
},
// 表单验证规则
formValidate: {},
submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据
selectCount: 0, // 多选计数
columns: [ columns: [
{ {
title: "账单号", title: "账单号",
key: "sn", key: "sn",
minWidth: 250, minWidth: 250,
tooltip: true }, tooltip: true
},
{ {
title: "生成时间", title: "生成时间",
key: "createTime", key: "createTime",
@ -178,50 +162,34 @@
}; };
}, },
methods: { methods: {
// 初始化数据
init() { init() {
this.getDataList(); this.getDataList();
}, },
// 分页 改变页码
changePage(v) { changePage(v) {
this.searchForm.pageNumber = v; this.searchForm.pageNumber = v;
this.getDataList(); this.getDataList();
this.clearSelectAll();
}, },
// 分页 改变页数
changePageSize(v) { changePageSize(v) {
this.searchForm.pageSize = v; this.searchForm.pageSize = v;
this.getDataList(); this.getDataList();
}, },
// 搜索
handleSearch() { handleSearch() {
this.searchForm.pageNumber = 1; this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
// 重置
handleReset() { handleReset() {
this.searchForm = {} this.searchForm = {}
this.searchForm.pageNumber = 1; this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
changeSort(e) { // 获取列表数据
this.searchForm.sort = e.key;
this.searchForm.order = e.order;
if (e.order === "normal") {
this.searchForm.order = "";
}
this.getDataList();
},
clearSelectAll() {
this.$refs.table.selectAll(false);
},
changeSelect(e) {
this.selectList = e;
this.selectCount = e.length;
},
selectDateRange(v) {
if (v) {
this.searchForm.startDate = v[0];
this.searchForm.endDate = v[1];
}
},
getDataList() { getDataList() {
this.loading = true; this.loading = true;
this.searchForm.billStatus = "OUT" this.searchForm.billStatus = "OUT"
@ -235,7 +203,7 @@
this.total = this.data.length; this.total = this.data.length;
this.loading = false; this.loading = false;
}, },
// 查看详情
detail(v) { detail(v) {
let id = v.id; let id = v.id;
this.$router.push({ this.$router.push({
@ -245,7 +213,7 @@
}, },
}, },
mounted() { activated() {
this.init(); this.init();
}, },
}; };

33
seller/src/views/shop/bill/billDetail.vue
View File

@ -1,8 +1,5 @@
<template> <template>
<div> <div class="bill-detail">
<template>
<Row>
<i-col span="24">
<Card> <Card>
<p slot="title">商家信息</p> <p slot="title">商家信息</p>
<div class="flex flex_align_item"> <div class="flex flex_align_item">
@ -13,13 +10,7 @@
<p>支行联行号：{{ bill.bankCode }}</p> <p>支行联行号：{{ bill.bankCode }}</p>
</div> </div>
</Card> </Card>
</i-col> <Card class="mt_10">
</Row>
</template>
<template>
<Row>
<i-col span="24">
<Card>
<p slot="title">账单详细</p> <p slot="title">账单详细</p>
<div class="tips-status"> <div class="tips-status">
@ -37,16 +28,11 @@
>对账</Button >对账</Button
> >
</div> </div>
<i-table :columns="columns" :data="data" stripe></i-table> <i-table :columns="columns" :data="data" stripe></i-table>
</Card> </Card>
</i-col> <Card class="mt_10">
</Row> <Tabs active-key="tab" type="card" @on-click="clickTabs">
</template>
<template>
<Tabs active-key="tab" @on-click="clickTabs">
<Tab-pane label="订单列表" name="order"> <Tab-pane label="订单列表" name="order">
<Card>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -66,10 +52,8 @@
show-elevator show-elevator
></Page> ></Page>
</Row> </Row>
</Card>
</Tab-pane> </Tab-pane>
<Tab-pane label="退单列表" name="refund"> <Tab-pane label="退单列表" name="refund">
<Card>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -89,10 +73,8 @@
show-elevator show-elevator
></Page> ></Page>
</Row> </Row>
</Card>
</Tab-pane> </Tab-pane>
<Tab-pane label="分销费用列表" name="distribution"> <Tab-pane label="分销费用列表" name="distribution">
<Card>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -112,10 +94,9 @@
show-elevator show-elevator
></Page> ></Page>
</Row> </Row>
</Card>
</Tab-pane> </Tab-pane>
</Tabs> </Tabs>
</template> </Card>
</div> </div>
</template> </template>
<script> <script>
@ -550,6 +531,7 @@ export default {
} }
}); });
}, },
// 账单详细
initTable() { initTable() {
let bill = this.bill; let bill = this.bill;
this.data[0].name = "结算单号"; this.data[0].name = "结算单号";
@ -613,6 +595,9 @@ export default {
margin: 15px 0; margin: 15px 0;
} }
} }
.page{
margin-top: 10px;
}
.tips-status { .tips-status {
padding: 18px; padding: 18px;
> span { > span {

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

@ -1,13 +1,13 @@
<template> <template>
<div class="search"> <div class="store-bill">
<Card> <Card>
<Row @keydown.enter.native="handleSearch">
<Form <Form
ref="searchForm" ref="searchForm"
:model="searchForm" :model="searchForm"
inline inline
:label-width="70" :label-width="70"
class="search-form" class="search-form"
@keydown.enter.native="handleSearch"
> >
<Form-item label="开始时间" prop="startDay"> <Form-item label="开始时间" prop="startDay">
<DatePicker <DatePicker
@ -40,7 +40,6 @@
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button> <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
<Button @click="handleReset" class="search-btn">重置</Button> <Button @click="handleReset" class="search-btn">重置</Button>
</Form> </Form>
</Row>
<Table <Table
:loading="loading" :loading="loading"
border border
@ -48,9 +47,6 @@
:data="data" :data="data"
ref="table" ref="table"
class="mt_10" class="mt_10"
sortable="custom"
@on-sort-change="changeSort"
@on-selection-change="changeSelect"
></Table> ></Table>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<Page <Page
@ -75,7 +71,6 @@
export default { export default {
name: "storeBill", name: "storeBill",
components: {},
data() { data() {
return { return {
loading: true, // 表单加载状态 loading: true, // 表单加载状态
@ -88,25 +83,13 @@
startDate: "", // 起始时间 startDate: "", // 起始时间
endDate: "", // 终止时间 endDate: "", // 终止时间
}, },
form: {
// 添加或编辑表单对象初始化数据
sn: "",
sellerName: "",
startTime: "",
endTime: "",
billPrice: "",
},
// 表单验证规则
formValidate: {},
submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据
selectCount: 0, // 多选计数
columns: [ columns: [
{ {
title: "账单号", title: "账单号",
key: "sn", key: "sn",
minWidth: 250, minWidth: 250,
tooltip: true }, tooltip: true
},
{ {
title: "生成时间", title: "生成时间",
key: "createTime", key: "createTime",
@ -185,50 +168,34 @@
}; };
}, },
methods: { methods: {
// 初始化数据
init() { init() {
this.getDataList(); this.getDataList();
}, },
// 分页 改变页码
changePage(v) { changePage(v) {
this.searchForm.pageNumber = v; this.searchForm.pageNumber = v;
this.getDataList(); this.getDataList();
this.clearSelectAll();
}, },
// 分页 改变页数
changePageSize(v) { changePageSize(v) {
this.searchForm.pageSize = v; this.searchForm.pageSize = v;
this.getDataList(); this.getDataList();
}, },
// 搜索
handleSearch() { handleSearch() {
this.searchForm.pageNumber = 1; this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
// 重置
handleReset() { handleReset() {
this.searchForm = {} this.searchForm = {}
this.searchForm.pageNumber = 1; this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
changeSort(e) { // 获取列表数据
this.searchForm.sort = e.key;
this.searchForm.order = e.order;
if (e.order === "normal") {
this.searchForm.order = "";
}
this.getDataList();
},
clearSelectAll() {
this.$refs.table.selectAll(false);
},
changeSelect(e) {
this.selectList = e;
this.selectCount = e.length;
},
selectDateRange(v) {
if (v) {
this.searchForm.startDate = v[0];
this.searchForm.endDate = v[1];
}
},
getDataList() { getDataList() {
this.loading = true; this.loading = true;
API_Shop.getBillPage(this.searchForm).then((res) => { API_Shop.getBillPage(this.searchForm).then((res) => {
@ -241,7 +208,7 @@
this.total = this.data.length; this.total = this.data.length;
this.loading = false; this.loading = false;
}, },
// 跳转结算详情
detail(v) { detail(v) {
let id = v.id; let id = v.id;
this.$router.push({ this.$router.push({

64
seller/src/views/shop/ship/logistics.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="search"> <div class="logistics">
<Card> <Card>
<Table <Table
:loading="loading" :loading="loading"
@ -9,7 +9,6 @@
ref="table" ref="table"
sortable="custom" sortable="custom"
@on-sort-change="changeSort" @on-sort-change="changeSort"
@on-selection-change="changeSelect"
></Table> ></Table>
</Card> </Card>
</div> </div>
@ -20,7 +19,6 @@
export default { export default {
name: "logistics", name: "logistics",
components: {},
data() { data() {
return { return {
loading: true, // 表单加载状态 loading: true, // 表单加载状态
@ -31,21 +29,7 @@
sort: "createTime", // 默认排序字段 sort: "createTime", // 默认排序字段
order: "desc", // 默认排序方式 order: "desc", // 默认排序方式
}, },
form: {
// 添加或编辑表单对象初始化数据
sn: "",
sellerName: "",
startTime: "",
endTime: "",
billPrice: "",
},
// 表单验证规则
formValidate: {},
submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据
selectCount: 0, // 多选计数
columns: [ columns: [
{ {
title: "物流公司", title: "物流公司",
key: "name", key: "name",
@ -85,7 +69,7 @@
}, },
on: { on: {
click: () => { click: () => {
this.checked(params.row); this.open(params.row);
}, },
}, },
}, },
@ -106,7 +90,7 @@
}, },
on: { on: {
click: () => { click: () => {
this.unChecked(params.row); this.close(params.row);
}, },
}, },
}, },
@ -122,9 +106,11 @@
}; };
}, },
methods: { methods: {
// 初始化数据
init() { init() {
this.getDataList(); this.getDataList();
}, },
// 变更排序
changeSort(e) { changeSort(e) {
this.searchForm.sort = e.key; this.searchForm.sort = e.key;
this.searchForm.order = e.order; this.searchForm.order = e.order;
@ -133,10 +119,7 @@
} }
this.getDataList(); this.getDataList();
}, },
changeSelect(e) { // 获取数据
this.selectList = e;
this.selectCount = e.length;
},
getDataList() { getDataList() {
this.loading = true; this.loading = true;
API_Shop.getLogistics().then((res) => { API_Shop.getLogistics().then((res) => {
@ -147,8 +130,8 @@
}); });
this.loading = false; this.loading = false;
}, },
//物流公司选中 // 开启
checked(v) { open(v) {
this.$Modal.confirm({ this.$Modal.confirm({
title: "确认开启", title: "确认开启",
// 记得确认修改此处 // 记得确认修改此处
@ -165,11 +148,10 @@
} }
}); });
}, },
//物流公司取消选中 // 关闭
unChecked(v){ close(v){
this.$Modal.confirm({ this.$Modal.confirm({
title: "确认关闭", title: "确认关闭",
// 记得确认修改此处
content: "您确认关闭此物流公司?", content: "您确认关闭此物流公司?",
loading: true, loading: true,
onOk: () => { onOk: () => {
@ -189,29 +171,3 @@
}, },
}; };
</script> </script>
<style lang="scss">
// 建议引入通用样式 可删除下面样式代码
// @import "@/styles/table-common.scss";
.search {
.operation {
margin-bottom: 2vh;
}
.select-count {
font-weight: 600;
color: #40a9ff;
}
.select-clear {
margin-left: 10px;
}
.page {
margin-top: 2vh;
}
.drop-down {
margin-left: 5px;
}
}
</style>

7
seller/src/views/shop/ship/shipTemplate.vue
View File

@ -15,6 +15,7 @@
<tr> <tr>
<th colspan="20"> <th colspan="20">
<span class="temp-name">{{item.name}}</span> <span class="temp-name">{{item.name}}</span>
<Tag v-if="item.pricingMethod==='FREE'" class="baoyou" color="warning">包邮</Tag>
<span class="fr m-r-5"> <span class="fr m-r-5">
<time style="margin-right: 20px" title="最后编辑时间"> <time style="margin-right: 20px" title="最后编辑时间">
<i class="icon-time"></i>{{item.updateTime}} <i class="icon-time"></i>{{item.updateTime}}
@ -160,7 +161,6 @@ export default {
components: { components: {
multipleRegion, multipleRegion,
}, },
data() { data() {
return { return {
selectedIndex: 0, //选中的地址模板下标 selectedIndex: 0, //选中的地址模板下标
@ -201,6 +201,7 @@ export default {
}, },
}, },
methods: { methods: {
// 初始化数据
init() { init() {
this.getData(); this.getData();
}, },
@ -278,7 +279,6 @@ export default {
this.shipInfo = res.result; this.shipInfo = res.result;
}); });
}, },
/** /**
* 选择地址回调 * 选择地址回调
*/ */
@ -604,4 +604,7 @@ em {
font-size: 15px; font-size: 15px;
color: #f00; color: #f00;
} }
.baoyou {
margin: 6px 10px 0;
}
</style> </style>

61
seller/src/views/shop/shopAddress.vue
View File

@ -1,22 +1,16 @@
<template> <template>
<div class="search"> <div class="self-address">
<Row>
<Col>
<Card> <Card>
<Row class="operation">
<Button @click="add" type="primary">添加</Button> <Button @click="add" type="primary">添加</Button>
</Row>
<Table <Table
:loading="loading" :loading="loading"
border border
:columns="columns" :columns="columns"
:data="data" :data="data"
ref="table" ref="table"
sortable="custom" style="margin-top:10px"
@on-selection-change="changeSelect"
></Table> ></Table>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" style="margin-top:10px;">
<Page <Page
:current="searchForm.pageNumber" :current="searchForm.pageNumber"
:total="total" :total="total"
@ -31,8 +25,6 @@
></Page> ></Page>
</Row> </Row>
</Card> </Card>
</Col>
</Row>
<Modal <Modal
:title="modalTitle" :title="modalTitle"
v-model="modalVisible" v-model="modalVisible"
@ -84,7 +76,6 @@
pageNumber: 1, // 当前页数 pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小 pageSize: 10, // 页面大小
}, },
selectDate: null,
form: { form: {
// 添加或编辑表单对象初始化数据 // 添加或编辑表单对象初始化数据
addressName: "", addressName: "",
@ -135,8 +126,6 @@
], ],
}, },
submitLoading: false, // 添加或编辑提交状态 submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据
selectCount: 0, // 多选计数
columns: [ columns: [
// 表头 // 表头
{ {
@ -208,44 +197,39 @@
}; };
}, },
methods: { methods: {
init() { init() { // 初始化数据
this.getDataList(); this.getDataList();
}, },
// 分页 改变页码
changePage(v) { changePage(v) {
this.searchForm.pageNumber = v; this.searchForm.pageNumber = v;
this.getDataList(); this.getDataList();
this.clearSelectAll();
}, },
// 分页 改变页数
changePageSize(v) { changePageSize(v) {
this.searchForm.pageSize = v; this.searchForm.pageSize = v;
this.getDataList(); this.getDataList();
}, },
// 搜索
handleSearch() { handleSearch() {
this.searchForm.pageNumber = 1; this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
// 重置
handleReset() { handleReset() {
this.$refs.searchForm.resetFields(); this.$refs.searchForm.resetFields();
this.searchForm.pageNumber = 1; this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
// 重新加载数据
this.getDataList(); this.getDataList();
}, },
clearSelectAll() {
this.$refs.table.selectAll(false);
},
changeSelect(e) {
this.selectList = e;
this.selectCount = e.length;
},
//获取地址 //获取地址
getAddress(item){ getAddress(item){
this.$set(this.form, 'address', item.addr) this.$set(this.form, 'address', item.addr)
this.form.address = item.address this.form.address = item.address
this.form.center = item.position.lat + "," + item.position.lng this.form.center = item.position.lat + "," + item.position.lng
}, },
// 获取数据
getDataList() { getDataList() {
this.loading = true; this.loading = true;
API_Shop.getShopAddress(this.searchForm).then((res) => { API_Shop.getShopAddress(this.searchForm).then((res) => {
@ -308,7 +292,7 @@
} }
}); });
}, },
//删除提交 //删除
deleteSubmit(v){ deleteSubmit(v){
this.$Modal.confirm({ this.$Modal.confirm({
title: "确认删除", title: "确认删除",
@ -332,29 +316,4 @@
}, },
}; };
</script> </script>
<style lang="scss">
// 建议引入通用样式 可删除下面样式代码
// @import "@/styles/table-common.scss";
.search {
.operation {
margin-bottom: 2vh;
}
.select-count {
font-weight: 600;
color: #40a9ff;
}
.select-clear {
margin-left: 10px;
}
.page {
margin-top: 2vh;
}
.drop-down {
margin-left: 5px;
}
}
</style>

1
seller/src/views/shop/shopSetting.vue
View File

@ -187,6 +187,7 @@ export default {
}; };
}, },
methods: { methods: {
// 初始化数据
init() { init() {
this.getShopInfo(); this.getShopInfo();
}, },

6
seller/src/views/statistics/goods.vue
View File

@ -20,9 +20,11 @@
</div> </div>
</template> </template>
<script> <script>
import affixTime from "@/views/lili-components/affix-time";
import * as API_Goods from "@/api/goods"; import * as API_Goods from "@/api/goods";
import Cookies from "js-cookie"; import Cookies from "js-cookie";
export default { export default {
components: { affixTime },
data() { data() {
return { return {
params: { // 请求参数 params: { // 请求参数
@ -56,11 +58,12 @@ export default {
}; };
}, },
methods: { methods: {
// tab切换
handleClickType(name) { handleClickType(name) {
this.params.type = name; this.params.type = name;
this.getData(); this.getData();
}, },
// 时间筛选
clickBreadcrumb(item, index) { clickBreadcrumb(item, index) {
let callback = item; let callback = item;
let type = this.params.type; let type = this.params.type;
@ -68,6 +71,7 @@ export default {
this.params.type = type; this.params.type = type;
this.getData(); this.getData();
}, },
// 获取数据
getData() { getData() {
Promise.all([API_Goods.goodsStatistics(this.params)]).then((res) => { Promise.all([API_Goods.goodsStatistics(this.params)]).then((res) => {
if (res[0].result) { if (res[0].result) {

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

@ -499,7 +499,7 @@ export default {
}); });
this.orderChart.render(); this.orderChart.render();
}, },
// 时间筛选
clickBreadcrumb(item, index) { clickBreadcrumb(item, index) {
let callback = JSON.parse(JSON.stringify(item)); let callback = JSON.parse(JSON.stringify(item));

6
seller/src/views/statistics/order/orderDetail.vue
View File

@ -1,6 +1,5 @@
<template> <template>
<div class="wrapper"> <div>
<div class="shop"> <div class="shop">
<h3>订单详情</h3> <h3>订单详情</h3>
<div class="shop-item"> <div class="shop-item">
@ -69,7 +68,6 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
@ -91,8 +89,6 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.wrapper {
}
.shop { .shop {
padding: 10px 0; padding: 10px 0;
background: #fff; background: #fff;

221
seller/src/views/statistics/order/orderStatistics.vue
View File

@ -1,221 +0,0 @@
<template>
<div class="search">
<Row>
<Col>
<Card>
<Form
label-position="left"
ref="searchForm"
:model="params"
inline
:label-width="100"
>
<Form-item label="选择时间类型" prop="sn">
<Select v-model="params.timeType" style="width: 200px">
<Option
v-for="item in typeList"
:value="item.value"
:key="item.value"
>{{ item.label }}
</Option
>
</Select>
</Form-item>
<Form-item label="按年查询" prop="year">
<DatePicker
type="year"
style="width: 200px"
v-model="year"
@on-change="changeYear"
></DatePicker>
</Form-item>
<Form-item label="按月查询" v-if="params.timeType == 'MONTH'">
<InputNumber :max="12" :min="1" v-model="params.month"></InputNumber>
</Form-item>
</Form>
</Card>
<Card style="margin-top: 2px;height: 130px">
<h3>订单统计</h3>
<div class="ant-row">
<div class="ant-col-4">
<p class="static-menu">
<span style="font-size: 14px;">总数</span>
</p>
<p class="static-num">
{{priceData.totalNum}}
</p>
</div>
<div>
<p class="static-menu">
<span style="font-size: 14px;">总金额</span>
</p>
<p class="static-num">
{{ priceData.price | unitPrice('￥') }}
</p>
</div>
</div>
</Card>
<Card style="margin-top: 2px">
<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
how-sizer></Page>
</Row>
</Card>
</Col>
</Row>
</div>
</template>
<script>
import * as API_Statistics from "@/api/statistics";
export default {
name: "goodsStatistics",
components: {},
data() {
return {
searchForm: [],
params: {
pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小
type: "NUM",
timeType: "YEAR",
year:'',
},
year:'',
priceData:{
totalNum:0,
price:0
},
loading: true, // 表单加载状态
typeList: [
{
value: "YEAR",
label: "年",
},
{
value: "MONTH",
label: "月",
},
],
columns: [
{
title: "店铺",
key: "sellerName",
},
{
title: "订单编号",
key: "orderItemSn",
},
{
title: "购买人",
key: "memberName",
},
{
title: "订单金额",
key: "finalPrice",
},
{
title: "创建时间",
key: "createTime",
},
],
data: [],
total: 0 // 表单数据总数
};
},
watch: {
params: {
handler(val) {
this.init();
},
deep: true,
}
},
methods: {
//初始化
init() {
this.getDataPage()
},
getDataPage() {
this.loading = true;
API_Statistics.getOrderStatistics(this.params).then((res) => {
this.loading = false;
this.data = res.result.records
this.total = res.result.total
});
API_Statistics.getOrderStatisticsPrice(this.params).then((res) => {
this.loading = false;
this.priceData.totalNum = res.result.num
this.priceData.price = res.result.price?res.result.price:0
});
},
changeYear(item){
this.params.year = item;
}
},
mounted() {
let nowDate = new Date();
this.params.year = this.year = nowDate.getFullYear() + ''
this.init();
},
};
</script>
<style lang="scss">
// 建议引入通用样式 可删除下面样式代码
@import "@/styles/table-common.scss";
.ant-row {
position: relative;
height: auto;
margin-right: 0;
margin-left: 0;
zoom: 1;
display: block;
box-sizing: border-box;
margin-left: 30px;
margin-top: 10px;
}
.ant-col-4 {
display: block;
box-sizing: border-box;
width: 11%;
flex: 0 0 auto;
float: left;
}
.static-num {
color: rgb(51, 51, 51);
font-size: 16px;
padding: 5px;
}
.static-menu {
color: rgb(51, 51, 51);
font-size: 16px;
padding: 5px;
}
</style>

5
seller/src/views/statistics/order/refundOrder.vue
View File

@ -1,6 +1,5 @@
<template> <template>
<div class="wrapper"> <div>
<div class="shop"> <div class="shop">
<h3>售后详情</h3> <h3>售后详情</h3>
<div class="shop-item"> <div class="shop-item">
@ -111,8 +110,6 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.wrapper {
}
.shop { .shop {
padding: 10px 0; padding: 10px 0;
background: #fff; background: #fff;

10
seller/src/views/statistics/traffic.vue
View File

@ -1,9 +1,8 @@
<template> <template>
<div class="wrapper"> <div>
<Affix :offset-top="100"> <Affix :offset-top="100">
<Card class="card fixed-bottom"> <Card class="card fixed-bottom">
<affixTime @selected="clickBreadcrumb" /> <affixTime @selected="clickBreadcrumb" />
</Card> </Card>
</Affix> </Affix>
<Card class="card"> <Card class="card">
@ -45,11 +44,8 @@
<div> <div>
<h4>客户增长报表</h4> <h4>客户增长报表</h4>
<Table class="table" stripe :columns="columns" :data="data"></Table> <Table class="table" stripe :columns="columns" :data="data"></Table>
</div> </div>
</Card> </Card>
</div>
</div> </div>
</template> </template>
<script> <script>
@ -186,13 +182,13 @@ export default {
this.orderChart.render(); this.orderChart.render();
}, },
// 时间筛选
clickBreadcrumb(item, index) { clickBreadcrumb(item, index) {
let callback = JSON.parse(JSON.stringify(item)); let callback = JSON.parse(JSON.stringify(item));
this.params = callback; this.params = callback;
}, },
// 初始化
init() { init() {
API_Member.getStatisticsList(this.params).then((res) => { API_Member.getStatisticsList(this.params).then((res) => {
if (res.result) { if (res.result) {