diff --git a/manager/src/main.js b/manager/src/main.js index 5c3ffde7..04817844 100644 --- a/manager/src/main.js +++ b/manager/src/main.js @@ -49,10 +49,14 @@ Vue.prototype.linkTo = function (goodsId, skuId) { window.open(src, "_blank"); }; -Vue.prototype.wapLinkTo = function (goodsId, skuId) { // app端二维码 - return `${WAP_URL}/pages/product/goods?id=${skuId}&goodsId=${goodsId}` +Vue.prototype.wapLinkTo = function (goodsId, skuId) { + // app端二维码 + if (skuId) { + return `${WAP_URL}/pages/product/goods?id=${skuId}&goodsId=${goodsId}`; + } else { + return `${WAP_URL}/pages/product/goods?goodsId=${goodsId}`; + } }; - // 引入价格格式化组件 import priceColorScheme from 'price-color' Vue.use(priceColorScheme); diff --git a/seller/src/views/order/after-order/returnGoodsOrder.vue b/seller/src/views/order/after-order/returnGoodsOrder.vue index 8b38de0a..72da26b9 100644 --- a/seller/src/views/order/after-order/returnGoodsOrder.vue +++ b/seller/src/views/order/after-order/returnGoodsOrder.vue @@ -241,10 +241,21 @@ }, // 重置 handleReset() { - this.searchForm = {}; + const defaultForm = { + // 搜索框初始化对象 + pageNumber: 1, // 当前页数 + pageSize: 10, // 页面大小 + sort: "createTime", // 默认排序字段 + order: "desc", // 默认排序方式 + startDate: "", // 起始时间 + endDate: "", // 终止时间 + serviceType:"RETURN_GOODS", + orderSn:"", + memberName:"", + goodsName:"" + } + this.searchForm = defaultForm; this.selectDate = '' - this.searchForm.pageNumber = 1; - this.searchForm.pageSize = 10; this.getDataList(); }, // 范围时间选择格式化 diff --git a/seller/src/views/order/after-order/returnMoneyOrder.vue b/seller/src/views/order/after-order/returnMoneyOrder.vue index d01ffeea..08df55d4 100644 --- a/seller/src/views/order/after-order/returnMoneyOrder.vue +++ b/seller/src/views/order/after-order/returnMoneyOrder.vue @@ -235,10 +235,21 @@ }, // 重置 handleReset() { + this.searchForm = { + // 搜索框初始化对象 + pageNumber: 1, // 当前页数 + pageSize: 10, // 页面大小 + sort: "createTime", // 默认排序字段 + order: "desc", // 默认排序方式 + startDate: "", // 起始时间 + endDate: "", // 终止时间 + serviceType:"RETURN_MONEY", + orderSn:"", + memberName:"", + goodsName:"" + } this.selectDate = '' - this.searchForm = {} - this.searchForm.pageNumber = 1; - this.searchForm.pageSize = 10; + this.getDataList(); }, // 范围时间重新赋值