@@ -177,7 +177,7 @@ export default {
data() {
return {
- orderOrRefund: true, // 订单还是单
+ orderOrRefund: 1, // 订单还是单
total: "0", // 总数
// 订单状态
orderStatusList: {
@@ -456,7 +456,7 @@ export default {
},
orderOrRefund:{ // 订单还是退单
handler (val) {
- if (val) {
+ if (val == 1) {
this.getOrderList();
} else {
this.getOrderRefundList();
diff --git a/seller/public/index.html b/seller/public/index.html
index cb8c0207..b7c7be20 100644
--- a/seller/public/index.html
+++ b/seller/public/index.html
@@ -19,7 +19,6 @@
-
diff --git a/seller/src/main.js b/seller/src/main.js
index 3752e635..1869ce00 100644
--- a/seller/src/main.js
+++ b/seller/src/main.js
@@ -6,7 +6,7 @@ import "./styles/theme.less";
import "core-js/stable";
// import "regenerator-runtime/runtime";
-import vueQr from 'vue-qr'
+import vueQr from "vue-qr";
import App from "./App";
import { router } from "./router/index";
@@ -43,7 +43,7 @@ Vue.use(ViewUI, {
});
Vue.use(VueClipboard);
-Vue.component(vueQr)
+Vue.component("vue-qr", vueQr); //此处将vue-qr添加为全局组件
// 挂载全局使用的方法
Vue.prototype.getRequest = getRequest;
@@ -56,13 +56,18 @@ Vue.prototype.setStore = setStore;
Vue.prototype.getStore = getStore;
Vue.prototype.removeStore = removeStore;
Vue.prototype.md5 = md5;
-const buyerUrlPC = 'https://pc-b2b2c.pickmall.cn' // 跳转买家端地址 pc端
-const buyerUrlWap = 'https://m-b2b2c.pickmall.cn' // 跳转买家端地址 wap端
-Vue.prototype.linkTo = function (goodsId, skuId) { // 跳转买家端商品
- window.open(`${buyerUrlPC}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank')
+const buyerUrlPC = "https://pc-b2b2c.pickmall.cn"; // 跳转买家端地址 pc端
+const buyerUrlWap = "https://m-b2b2c.pickmall.cn"; // 跳转买家端地址 wap端
+Vue.prototype.linkTo = function(goodsId, skuId) {
+ // 跳转买家端商品
+ window.open(
+ `${buyerUrlPC}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`,
+ "_blank"
+ );
};
-Vue.prototype.wapLinkTo = function (goodsId, skuId) { // app端二维码
- return `${buyerUrlWap}/pages/product/goods?id=${skuId}&goodsId=${goodsId}`
+Vue.prototype.wapLinkTo = function(goodsId, skuId) {
+ // app端二维码
+ return `${buyerUrlWap}/pages/product/goods?id=${skuId}&goodsId=${goodsId}`;
};
Array.prototype.remove = function(from, to) {
diff --git a/seller/src/views/distribution/distributionGoods.vue b/seller/src/views/distribution/distributionGoods.vue
index cc8e34d1..2dd663e7 100644
--- a/seller/src/views/distribution/distributionGoods.vue
+++ b/seller/src/views/distribution/distributionGoods.vue
@@ -12,7 +12,7 @@
-
+
@@ -107,11 +107,6 @@ export default {
}],
},
columns: [ // 表格表头
- {
- type: "selection",
- width: 60,
- align: "center"
- },
{
title: "商品名称",
key: "goodsName",
diff --git a/seller/src/views/goods/goods-manage/category.vue b/seller/src/views/goods/goods-manage/category.vue
index 625df50e..fe15e187 100644
--- a/seller/src/views/goods/goods-manage/category.vue
+++ b/seller/src/views/goods/goods-manage/category.vue
@@ -1,6 +1,5 @@
-
@@ -60,7 +59,7 @@
-
+
diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue
index 45e872b0..16a24faf 100644
--- a/seller/src/views/goods/goods-seller/goods.vue
+++ b/seller/src/views/goods/goods-seller/goods.vue
@@ -55,6 +55,7 @@
+
@@ -73,7 +74,7 @@
-
+
@@ -117,6 +118,7 @@ import {
import * as API_Shop from "@/api/shops";
export default {
+
name: "goods",
data() {
return {
diff --git a/seller/src/views/lili-components/region.vue b/seller/src/views/lili-components/region.vue
index 8e5fb7bb..5254edcd 100644
--- a/seller/src/views/lili-components/region.vue
+++ b/seller/src/views/lili-components/region.vue
@@ -4,11 +4,10 @@
:data="data"
:load-data="loadData"
change-on-select
- v-model="dd"
@on-visible-change="handleChangeOnSelect"
@on-change="change"
>
- {{ dd }}
+
diff --git a/seller/src/views/promotion/seckill/seckill.vue b/seller/src/views/promotion/seckill/seckill.vue
index 373b0dd8..3aad7493 100644
--- a/seller/src/views/promotion/seckill/seckill.vue
+++ b/seller/src/views/promotion/seckill/seckill.vue
@@ -68,6 +68,7 @@ export default {
components: {},
data() {
return {
+ selectDate:[],
loading: true, // 表单加载状态
searchForm: {
// 搜索框初始化对象
diff --git a/seller/src/views/promotion/seckill/seckillGoods.vue b/seller/src/views/promotion/seckill/seckillGoods.vue
index b85f3982..fc78ea11 100644
--- a/seller/src/views/promotion/seckill/seckillGoods.vue
+++ b/seller/src/views/promotion/seckill/seckillGoods.vue
@@ -22,7 +22,7 @@
v-for="(tab, tabIndex) in goodsList"
:key="tabIndex"
:label="tab.hour"
- :name="tabIndex"
+ :name="tabIndex + ''"
>
-
+
- | {{item.name}} | {{item.value}} |
+ {{item.name}} |
+ {{item.value}} |
@@ -58,12 +53,12 @@
退单产生退还佣金金额
+{{bill.refundCommissionPrice || 0 | unitPrice('￥')}}
-
+
退单分销返现返还
+{{bill.distributionRefundCommission || 0 | unitPrice('￥')}}
-
+
退单平台优惠券返还
+{{bill.siteCouponRefundCommission || 0 | unitPrice('￥')}}
@@ -82,67 +77,25 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
@@ -155,6 +108,7 @@ export default {
name: "bill-detail",
data() {
return {
+ loading: true,
columns: [
{
title: "项目",
@@ -166,7 +120,8 @@ export default {
key: "value",
},
],
- data: [ // 账单数据
+ data: [
+ // 账单数据
{
name: "计算中",
value: 0,
@@ -199,7 +154,7 @@ export default {
{
name: "计算公式",
value: 0,
- }
+ },
],
id: "", // 账单id
bill: {}, // 商家信息
@@ -236,10 +191,13 @@ export default {
if (params.row.kanjiaSettlementPrice) {
return h(
"div",
- this.$options.filters.unitPrice(params.row.kanjiaSettlementPrice, "￥")
+ this.$options.filters.unitPrice(
+ params.row.kanjiaSettlementPrice,
+ "￥"
+ )
);
} else {
- return h('div','￥0.00')
+ return h("div", "￥0.00");
}
},
},
@@ -247,13 +205,16 @@ export default {
title: "积分商品结算价格",
key: "pointSettlementPrice",
render: (h, params) => {
- if (params.row.pointSettlementPrice){
+ if (params.row.pointSettlementPrice) {
return h(
"div",
- this.$options.filters.unitPrice(params.row.pointSettlementPrice, "￥")
+ this.$options.filters.unitPrice(
+ params.row.pointSettlementPrice,
+ "￥"
+ )
);
} else {
- return h('div','￥0.00')
+ return h("div", "￥0.00");
}
},
},
@@ -271,36 +232,34 @@ export default {
title: "平台优惠券",
key: "siteCouponPrice",
render: (h, params) => {
- if(params.row.siteCouponPrice == null){
+ if (params.row.siteCouponPrice == null) {
+ return h("div", "-");
+ } else {
return h(
"div",
- "-"
- );
- }else{
- return h(
- "div",
- this.$options.filters.unitPrice(params.row.siteCouponPrice, "￥")
+ this.$options.filters.unitPrice(
+ params.row.siteCouponPrice,
+ "￥"
+ )
);
}
-
},
},
{
title: "分销金额",
key: "distributionRebate",
render: (h, params) => {
- if(params.row.distributionRebate == null){
+ if (params.row.distributionRebate == null) {
+ return h("div", "-");
+ } else {
return h(
"div",
- "-"
- );
- }else{
- return h(
- "div",
- this.$options.filters.unitPrice(params.row.distributionRebate, "￥")
+ this.$options.filters.unitPrice(
+ params.row.distributionRebate,
+ "￥"
+ )
);
}
-
},
},
{
@@ -313,7 +272,6 @@ export default {
);
},
},
-
],
orderData: [], // 订单列表
orderTotal: 0, // 订单数量
@@ -329,17 +287,17 @@ export default {
{
title: "退款时间",
key: "createTime",
- minWidth: 120
+ minWidth: 120,
},
{
title: "退款流水编号",
key: "sn",
- minWidth: 130
+ minWidth: 130,
},
{
title: "订单编号",
key: "sn",
- minWidth: 120
+ minWidth: 120,
},
{
title: "退款金额",
@@ -357,16 +315,16 @@ export default {
key: "commissionPrice",
minWidth: 120,
render: (h, params) => {
- if(params.row.commissionPrice){
+ if (params.row.commissionPrice) {
return h(
"div",
- this.$options.filters.unitPrice(params.row.commissionPrice, "￥")
- );
- }else{
- return h(
- "div",
- this.$options.filters.unitPrice(0, "￥")
+ this.$options.filters.unitPrice(
+ params.row.commissionPrice,
+ "￥"
+ )
);
+ } else {
+ return h("div", this.$options.filters.unitPrice(0, "￥"));
}
},
},
@@ -374,25 +332,24 @@ export default {
{
title: "退还平台优惠券",
key: "siteCouponCommission",
- minWidth: 140
+ minWidth: 140,
},
{
title: "退还分销",
key: "distributionRebate",
minWidth: 120,
render: (h, params) => {
- if(params.row.distributionRebate == null){
+ if (params.row.distributionRebate == null) {
+ return h("div", "-");
+ } else {
return h(
"div",
- "-"
- );
- }else{
- return h(
- "div",
- this.$options.filters.unitPrice(params.row.distributionRebate, "￥")
+ this.$options.filters.unitPrice(
+ params.row.distributionRebate,
+ "￥"
+ )
);
}
-
},
},
@@ -401,18 +358,14 @@ export default {
key: "billPrice",
minWidth: 120,
render: (h, params) => {
- if(params.row.billPrice == null){
- return h(
- "div",
- "-"
- );
- }else{
+ if (params.row.billPrice == null) {
+ return h("div", "-");
+ } else {
return h(
"div",
this.$options.filters.unitPrice(params.row.billPrice, "￥")
);
}
-
},
},
],
@@ -429,18 +382,18 @@ export default {
{
title: "订单编号",
key: "sn",
- minWidth: 120
+ minWidth: 120,
},
{
title: "交易金额",
key: "finalPrice",
- minWidth: 120
+ minWidth: 120,
},
{
title: "商品名称",
key: "goodsName",
minWidth: 120,
- tooltip: true
+ tooltip: true,
},
{
title: "规格",
@@ -456,7 +409,7 @@ export default {
{
title: "店铺名称",
key: "storeName",
- minWidth: 120
+ minWidth: 120,
},
{
@@ -464,53 +417,55 @@ export default {
key: "distributionRebate",
minWidth: 120,
render: (h, params) => {
- if(params.row.flowType === "退款" ){
- return h(
- "div",
- this.$options.filters.unitPrice("-"+params.row.distributionRebate, "￥")
- );
- }else{
- if(params.row.distributionRebate){
- return h(
- "div",
- this.$options.filters.unitPrice(params.row.distributionRebate, "￥")
- );
- }else{
- return h(
- "div",
- this.$options.filters.unitPrice(0, "￥")
- );
- }
- }
+ if (params.row.flowType === "退款") {
+ return h(
+ "div",
+ this.$options.filters.unitPrice(
+ "-" + params.row.distributionRebate,
+ "￥"
+ )
+ );
+ } else {
+ if (params.row.distributionRebate) {
+ return h(
+ "div",
+ this.$options.filters.unitPrice(
+ params.row.distributionRebate,
+ "￥"
+ )
+ );
+ } else {
+ return h("div", this.$options.filters.unitPrice(0, "￥"));
+ }
+ }
},
},
{
title: "时间",
key: "createTime",
- minWidth: 120
+ minWidth: 120,
},
],
distributionData: [], // 分销数据
distributionTotal: 0, // 分销总数
-
};
},
watch: {
- '$route.query.id': function (val) {
+ "$route.query.id": function (val) {
this.id = val;
this.getBill();
- }
+ },
},
methods: {
clickTabs(v) {
if (v == "order") {
this.orderParam.flowType = "PAY";
- this.getOrderList()
- } else if(v === "refund"){
+ this.getOrderList();
+ } else if (v === "refund") {
this.orderParam.flowType = "REFUND";
- this.getRefundList()
- }else{
- this.getDistributionList()
+ this.getRefundList();
+ } else {
+ this.getDistributionList();
}
},
//核对结算单
@@ -528,7 +483,7 @@ export default {
this.init();
}
});
- }
+ },
});
},
@@ -539,15 +494,16 @@ export default {
//订单列表部分
orderChangePage(v) {
this.orderParam.pageNumber = v;
- this.getOrderList()
+ this.getOrderList();
},
orderChangePageSize(v) {
this.orderParam.pageSize = v;
- this.getOrderList()
+ this.getOrderList();
},
- getOrderList(){
- API_Shop.getSellerFlow(this.id,this.orderParam).then((res) => {
+ getOrderList() {
+ API_Shop.getSellerFlow(this.id, this.orderParam).then((res) => {
if (res.success) {
+ this.loading = false;
this.orderData = res.result.records;
this.orderTotal = res.result.total;
}
@@ -556,11 +512,11 @@ export default {
//退单部分
refundChangePage(v) {
this.refundParam.pageNumber = v;
- this.getRefundList()
+ this.getRefundList();
},
refundChangePageSize(v) {
this.refundParam.pageSize = v;
- this.getRefundList()
+ this.getRefundList();
},
getRefundList() {
API_Shop.getSellerFlow(this.id, this.refundParam).then((res) => {
@@ -574,23 +530,25 @@ export default {
//分销费用列表
distributionChangePage(v) {
this.distributionParam.pageNumber = v;
- this.getDistributionList()
+ this.getDistributionList();
},
distributionChangePageSize(v) {
this.distributionParam.pageSize = v;
- this.getDistributionList()
+ this.getDistributionList();
},
getDistributionList() {
- API_Shop.getDistributionFlow(this.id, this.distributionParam).then((res) => {
- this.loading = false;
- if (res.result) {
- this.distributionData = res.result.records;
- this.distributionTotal = res.result.total;
+ API_Shop.getDistributionFlow(this.id, this.distributionParam).then(
+ (res) => {
+ this.loading = false;
+ if (res.result) {
+ this.distributionData = res.result.records;
+ this.distributionTotal = res.result.total;
+ }
}
- });
+ );
},
//获取结算单详细
- getBill(){
+ getBill() {
API_Shop.getBillDetail(this.id).then((res) => {
if (res.success) {
this.bill = res.result;
@@ -623,22 +581,27 @@ export default {
this.data[5].value = bill.payTime === null ? "未付款" : bill.payTime;
this.data[6].name = "订单付款总金额";
- this.data[6].value = filters.unitPrice(bill.orderPrice?bill.orderPrice:0, "¥");
+ this.data[6].value = filters.unitPrice(
+ bill.orderPrice ? bill.orderPrice : 0,
+ "¥"
+ );
this.data[7].name = "结算金额";
- this.data[7].value = filters.unitPrice(bill.billPrice?bill.billPrice:0, "¥");
+ this.data[7].value = filters.unitPrice(
+ bill.billPrice ? bill.billPrice : 0,
+ "¥"
+ );
},
-
},
mounted() {
this.init();
},
// 如果是从详情页返回列表页，修改列表页keepAlive为true，确保不刷新页面
- beforeRouteLeave(to, from, next){
- if(to.name === 'accountStatementBill' || to.name === 'storeBill') {
- to.meta.keepAlive = true
+ beforeRouteLeave(to, from, next) {
+ if (to.name === "accountStatementBill" || to.name === "storeBill") {
+ to.meta.keepAlive = true;
}
- next()
- }
+ next();
+ },
};
@@ -651,7 +614,7 @@ export default {
margin: 15px 0;
}
}
-.page{
+.page {
margin-top: 10px;
}
.tips-status {
@@ -665,33 +628,32 @@ export default {
color: $theme_color;
}
}
-table{
+table {
font-size: 14px;
margin-left: 20px;
- tr{
+ tr {
height: 40px;
padding: 10px;
- td:nth-child(1){
+ td:nth-child(1) {
width: 120px;
}
}
}
-.bill-detail-price{
+.bill-detail-price {
display: flex;
align-items: center;
flex-wrap: wrap;
padding: 10px;
- >span{
-
+ > span {
font-size: 14px;
text-align: center;
width: 200px;
margin-bottom: 10px;
}
- .theme_color{
+ .theme_color {
color: $theme_color;
}
- .increase-color{
+ .increase-color {
color: green;
}
}
diff --git a/seller/src/views/shop/ship/shipTemplate.vue b/seller/src/views/shop/ship/shipTemplate.vue
index d17690e9..86e9c9b1 100644
--- a/seller/src/views/shop/ship/shipTemplate.vue
+++ b/seller/src/views/shop/ship/shipTemplate.vue
@@ -145,7 +145,7 @@
-
+
diff --git a/seller/src/views/shop/shopSetting.vue b/seller/src/views/shop/shopSetting.vue
index 251d9495..14ab1bea 100644
--- a/seller/src/views/shop/shopSetting.vue
+++ b/seller/src/views/shop/shopSetting.vue
@@ -1,70 +1,69 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -74,31 +73,30 @@
import * as API_Shop from "@/api/shops";
import { validateMobile } from "@/libs/validate";
import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
-import editor from "@/views/my-components/lili/editor";
import liliMap from "@/views/my-components/map/index";
-import region from "@/views/lili-components/region";
+import regionMap from "@/views/lili-components/region";
import * as RegExp from "@/libs/RegExp.js";
-import Cookies from 'js-cookie'
-
+import Cookies from "js-cookie";
export default {
name: "shopSetting",
components: {
uploadPicThumb,
- editor,
liliMap,
- region,
+ regionMap,
},
data() {
return {
+ type: "INFO",
showRegion: false, // 选择地址模态框显隐
storeName: "", //店铺名称
- region: [], // 地区名称
+ region: "", // 地区名称
regionId: [], // 地区id
- addressForm: { // 退货地址
+ addressForm: {
+ // 退货地址
salesConsigneeName: "", // 收货人姓名
salesConsigneeMobile: "", // 收货人电话
salesConsigneeAddressId: "", // 售后地址id,逗号分割
- salesConsigneeAddressPath: "",// 售后地址，逗号分割
+ salesConsigneeAddressPath: "", // 售后地址，逗号分割
salesConsigneeDetail: "", // 详细地址
},
//库存预警form
@@ -201,7 +199,7 @@ export default {
//库存预警数赋值
this.$nextTick(() => {
- this.stockWarningForm.stockWarning = res.result.stockWarning+"";
+ this.stockWarningForm.stockWarning = res.result.stockWarning + "";
});
}
});
diff --git a/seller/src/views/statistics/order.vue b/seller/src/views/statistics/order.vue
index b9985c21..1a4a8f2d 100644
--- a/seller/src/views/statistics/order.vue
+++ b/seller/src/views/statistics/order.vue
@@ -149,8 +149,8 @@
订退单统计
- 订单
- 退单
+ 订单
+ 退单
@@ -175,8 +175,8 @@ export default {
data() {
return {
- orderOrRefund: true, // 订单还是退单
- total: "0", // 订单总数
+ orderOrRefund: 1, // 订单还是退单
+ total:0, // 订单总数
// 订单状态
orderStatusList: {
UNDELIVERED: "待发货",
@@ -457,15 +457,16 @@ export default {
},
deep: true,
},
- orderOrRefund:{ // 订单还是退单
- handler (val) {
- if (val) {
+ orderOrRefund: {
+ // 订单还是退单
+ handler(val) {
+ if (val == 1) {
this.getOrderList();
} else {
this.getOrderRefundList();
}
- }
- }
+ },
+ },
},
methods: {
// 订单图