diff --git a/manager/src/views/member/list/memberRecycle.vue b/manager/src/views/member/list/memberRecycle.vue index c9ff9850..ed38f4b5 100644 --- a/manager/src/views/member/list/memberRecycle.vue +++ b/manager/src/views/member/list/memberRecycle.vue @@ -40,7 +40,6 @@ ref="table" class="mt_10" sortable="custom" - @on-sort-change="changeSort" @on-selection-change="changeSelect" > diff --git a/manager/src/views/statistics/order.vue b/manager/src/views/statistics/order.vue index b97aa54c..b412eae2 100644 --- a/manager/src/views/statistics/order.vue +++ b/manager/src/views/statistics/order.vue @@ -149,8 +149,8 @@

订退单统计

@@ -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 @@ - +