From 882e222c5ad25e2c9aa4c74427ecd485c74b9c7a Mon Sep 17 00:00:00 2001 From: mabo Date: Mon, 24 May 2021 18:14:06 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=95=86=E5=93=81=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=99=A8=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/assets/images/geted.png | Bin 1550 -> 4495 bytes buyer/src/pages/payment/Pay.vue | 52 ++++++++++--- seller/src/views/lili-dialog/goods-dialog.vue | 37 ++++++--- seller/src/views/lili-dialog/index.vue | 28 ++----- seller/src/views/promotion/coupon/coupon.vue | 6 +- .../views/promotion/coupon/couponPublish.vue | 22 +++--- .../src/views/promotion/fullCut/fullCut.vue | 4 +- .../views/promotion/fullCut/newFullCut.vue | 38 ++++----- .../src/views/promotion/pintuan/pintuan.vue | 4 +- .../views/promotion/pintuan/pintuanGoods.vue | 33 ++++---- .../src/views/promotion/seckill/seckill.vue | 1 + .../views/promotion/seckill/seckillGoods.vue | 73 +++++++++--------- 12 files changed, 164 insertions(+), 134 deletions(-) diff --git a/buyer/src/assets/images/geted.png b/buyer/src/assets/images/geted.png index 9bab88c61c80e3631ab34ce4f8ac879870db3582..0dc683c07e105e82df11d7f0ef60d8b7d97ef961 100644 GIT binary patch literal 4495 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 uDOc?4vcmRPfd4bU0Oh8Z$ujE$OWkY diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue index 79dcbc9a..0ae2f84d 100644 --- a/buyer/src/pages/payment/Pay.vue +++ b/buyer/src/pages/payment/Pay.vue @@ -116,11 +116,13 @@ {{item.couponDiscount}}折 满{{item.consumeThreshold}}元可用 -

使用范围：{{useScope(item.scopeType)}}

-

有效期：{{item.endTime}}

+

使用范围：{{useScope(item.scopeType)}}

+

有效期：{{item.endTime}}

+ - 立即使用 + 立即使用 + 放弃优惠 @@ -207,7 +209,9 @@ export default { moreAddr: false, // 更多地址 canUseCouponNum: 0, // 可用优惠券数量 couponList: [], // 可用优惠券列表 - logoImg: '' // 平台logo + logoImg: '', // 平台logo + usedCouponId: [], // 已使用优惠券id + selectedCoupon: {} // 已选优惠券对象 }; }, mounted () { @@ -250,7 +254,10 @@ export default { this.goodsList = res.result.cartList; this.priceDetailDTO = res.result.priceDetailDTO; this.skuList = res.result.skuList; - let notSupArea = res.result.notSupportFreight + let notSupArea = res.result.notSupportFreight; + this.selectedCoupon = {} + if (res.result.platformCoupon) this.selectedCoupon.platformCoupon = res.result.platformCoupon + Object.assign(this.selectedCoupon, res.result.storeCoupons) if (notSupArea) { let content = []; let title = '' @@ -295,8 +302,22 @@ export default { storeId: storeArr.toString(), totalPrice: this.priceDetailDTO.goodsPrice } - canUseCouponList(params).then(res => { + canUseCouponList(params).then(res => { // 可用优惠券列表 if (res.success) this.couponList = res.result.records + const couponKeys = Object.keys(this.selectedCoupon) + this.usedCouponId = [] + if (couponKeys.length) { + this.couponList.forEach(e => { + if (e.id === this.selectedCoupon[couponKeys].memberCoupon.id) { + this.usedCouponId.push(e.id) + } + }) + this.$nextTick(() => { + this.$forceUpdate() + }) + } + + }) } }) @@ -361,16 +382,14 @@ export default { }); }, - useCoupon (id) { // 使用优惠券 + useCoupon (id, used) { // 使用优惠券 let params = { way: this.$route.query.way, memberCouponId: id, - used: true + used: used // true 为使用， false为弃用 } selectCoupon(params).then(res => { - if (res.success) { - this.init() - } + if (res.success) this.init() }) }, editInvoice () { // 编辑发票信息 @@ -774,5 +793,16 @@ export default { .circle-top,.circle-bottom{ right: 22px; } + .used { + position: absolute; + top: 60px; + right: 40px; + width: 50px; + height: 50px; + } +} +.coupon-list { + max-height: 260px; + overflow: scroll; } diff --git a/seller/src/views/lili-dialog/goods-dialog.vue b/seller/src/views/lili-dialog/goods-dialog.vue index b3064aa1..9703e8c5 100644 --- a/seller/src/views/lili-dialog/goods-dialog.vue +++ b/seller/src/views/lili-dialog/goods-dialog.vue @@ -41,12 +41,17 @@ - diff --git a/seller/src/views/promotion/live/live.vue b/seller/src/views/promotion/live/live.vue new file mode 100644 index 00000000..8360e046 --- /dev/null +++ b/seller/src/views/promotion/live/live.vue @@ -0,0 +1,134 @@ + + + + + diff --git a/seller/src/views/promotion/live/liveGoods.vue b/seller/src/views/promotion/live/liveGoods.vue new file mode 100644 index 00000000..62c7780f --- /dev/null +++ b/seller/src/views/promotion/live/liveGoods.vue @@ -0,0 +1,209 @@ + + + + + From 7729031efa31b4ff0c343af146fed4f034802025 Mon Sep 17 00:00:00 2001 From: mabo Date: Tue, 25 May 2021 17:08:23 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E5=95=86=E5=93=81=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=99=A8=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/goods/goods-info/goods.vue | 25 -- .../src/views/goods/goods-info/goodsApply.vue | 10 - .../src/views/goods/goods-refund/index.vue | 249 ------------------ .../src/views/goods/goods-review/index.vue | 10 - .../src/views/lili-dialog/goods-dialog.vue | 2 + manager/src/views/lili-dialog/index.vue | 9 +- manager/src/views/lili-dialog/link-dialog.vue | 2 +- .../views/lili-dialog/template/marketing.vue | 4 +- .../modelList/newGoodsSort.vue | 6 +- .../modelList/notEnough.vue | 5 +- .../modelList/recommend.vue | 2 +- manager/src/views/order/flow/refundLog.vue | 8 - .../views/order/order/fictitiousOrderList.vue | 10 - manager/src/views/order/order/orderDetail.vue | 2 +- manager/src/views/order/order/orderList.vue | 10 - manager/src/views/order/receipt/receipt.vue | 12 +- .../views/promotion/coupon/couponPublish.vue | 20 +- .../promotion/pointsGoods/editPointsGoods.vue | 16 +- .../views/promotion/seckill/addSeckill.vue | 18 +- .../seller/bill/accountStatementBill.vue | 71 ----- manager/src/views/seller/bill/bill.vue | 105 +------- manager/src/views/statistics/order.vue | 2 +- .../views/statistics/order/refundOrder.vue | 2 +- 23 files changed, 53 insertions(+), 547 deletions(-) delete mode 100644 manager/src/views/goods/goods-refund/index.vue diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue index 9ac9e257..33d8e705 100644 --- a/manager/src/views/goods/goods-info/goods.vue +++ b/manager/src/views/goods/goods-info/goods.vue @@ -105,7 +105,6 @@ ref="underForm" :model="underForm" :label-width="100" - :rules="formValidate" > @@ -133,9 +132,6 @@ export default { modalType: 0, // 添加或编辑标识 modalVisible: false, // 添加或编辑显示 modalTitle: "", // 添加或编辑标题 - drop: false, // 展开搜索框 - dropDownContent: "展开", // 展开标签文字 - dropDownIcon: "ios-arrow-down", // 展开图标 searchForm: { // 搜索框初始化对象 pageNumber: 1, // 当前页数 @@ -146,17 +142,6 @@ export default { underForm: { // 下架原因 reason: "", }, - form: { - // 添加或编辑表单对象初始化数据 - goodsName: "", - sn: "", - marketEnable: "", - price: "", - sellerName: "", - }, - // 表单验证规则 - - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 @@ -379,16 +364,6 @@ export default { this.selectList = e; this.selectCount = e.length; }, - dropDown() { - if (this.drop) { - this.dropDownContent = "展开"; - this.dropDownIcon = "ios-arrow-down"; - } else { - this.dropDownContent = "收起"; - this.dropDownIcon = "ios-arrow-up"; - } - this.drop = !this.drop; - }, getDataList() { this.loading = true; // 带多条件搜索参数获取表单数据 diff --git a/manager/src/views/goods/goods-info/goodsApply.vue b/manager/src/views/goods/goods-info/goodsApply.vue index 895f23fb..114fceee 100644 --- a/manager/src/views/goods/goods-info/goodsApply.vue +++ b/manager/src/views/goods/goods-info/goodsApply.vue @@ -105,16 +105,6 @@ goodsAuditForm: { // 商品编辑表单 is_auth: 1, }, - form: { - // 添加或编辑表单对象初始化数据 - goodsName: "", - sn: "", - marketEnable: "", - price: "", - sellerName: "", - }, - // 表单验证规则 - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 diff --git a/manager/src/views/goods/goods-refund/index.vue b/manager/src/views/goods/goods-refund/index.vue deleted file mode 100644 index 75a7b91f..00000000 --- a/manager/src/views/goods/goods-refund/index.vue +++ /dev/null @@ -1,249 +0,0 @@ - - - diff --git a/manager/src/views/goods/goods-review/index.vue b/manager/src/views/goods/goods-review/index.vue index c837f4ae..5bfb371c 100644 --- a/manager/src/views/goods/goods-review/index.vue +++ b/manager/src/views/goods/goods-review/index.vue @@ -114,16 +114,6 @@ export default { startDate: "", // 起始时间 endDate: "", // 终止时间 }, - form: { - // 添加或编辑表单对象初始化数据 - memberName: "", - storeName: "", - shopDisable: "", - id: "", - createTime: "", - }, - // 表单验证规则 - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 diff --git a/manager/src/views/lili-dialog/goods-dialog.vue b/manager/src/views/lili-dialog/goods-dialog.vue index ed8cf77a..ba878753 100644 --- a/manager/src/views/lili-dialog/goods-dialog.vue +++ b/manager/src/views/lili-dialog/goods-dialog.vue @@ -111,9 +111,11 @@ export default { initGoods(res) { if (res.result.records.length !=0) { + console.log(this.selectedWay); res.result.records.forEach((item) => { item.selected = false; item.___type = "goods"; //设置为goods让pc wap知道标识 + this.selectedWay.forEach(e => { if (e.id === item.id) { item.selected = true diff --git a/manager/src/views/lili-dialog/index.vue b/manager/src/views/lili-dialog/index.vue index 3c283d43..1fed5b96 100644 --- a/manager/src/views/lili-dialog/index.vue +++ b/manager/src/views/lili-dialog/index.vue @@ -25,9 +25,6 @@ export default { flag: false, // modal显隐 }; }, - props: ["types"], - watch: {}, - mounted() {}, methods: { // 关闭弹窗 clickClose() { @@ -51,13 +48,17 @@ export default { } this.clickClose(); }, - open(type) { + open(type, mutiple) { this.flag = true; if (type == "goods") { this.goodsFlag = true; + if (mutiple) { + this.singleGoods() + } } else { this.goodsFlag = false; } + }, close() { this.flag = false; diff --git a/manager/src/views/lili-dialog/link-dialog.vue b/manager/src/views/lili-dialog/link-dialog.vue index a5294ce5..0c68f0e3 100644 --- a/manager/src/views/lili-dialog/link-dialog.vue +++ b/manager/src/views/lili-dialog/link-dialog.vue @@ -40,7 +40,7 @@ export default { }, mounted() { this.$nextTick(() => { - this.$refs["lili-component"][0].type = "single"; //如果商品页面设置成为单选 + this.$refs["lili-component"][0].type = "single"; //商品页面设置成为单选 }); this.wap.forEach((item) => { diff --git a/manager/src/views/lili-dialog/template/marketing.vue b/manager/src/views/lili-dialog/template/marketing.vue index 4b89cd6d..04af40de 100644 --- a/manager/src/views/lili-dialog/template/marketing.vue +++ b/manager/src/views/lili-dialog/template/marketing.vue @@ -65,7 +65,7 @@ export default { }, { title: "店铺名称", - key: "sellerName", + key: "storeName", tooltip: true, }, { @@ -113,7 +113,7 @@ export default { }, { title: "店铺名称", - key: "sellerName", + key: "storeName", tooltip: true, }, { diff --git a/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue index 42da8019..c74d4b48 100644 --- a/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue +++ b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue @@ -176,12 +176,16 @@ export default { handleSelectGoods(item) { // 调起选择商品 console.warn(item); if (item) this.selected = item; - this.$refs.liliDialog.open('goods') + this.$refs.liliDialog.open('goods', 'single') + setTimeout(() => { + this.$refs.liliDialog.goodsData = [this.selected] + }, 500); }, selectedLink (val) { this.selected.url = this.$options.filters.formatLinkType(val); }, selectedGoodsData (val) { + console.log(val); let goods = val[0] console.log(this.selected); this.selected.img = goods.thumbnail diff --git a/manager/src/views/lili-floor-renovation/modelList/notEnough.vue b/manager/src/views/lili-floor-renovation/modelList/notEnough.vue index 2a93c86f..11b369b6 100644 --- a/manager/src/views/lili-floor-renovation/modelList/notEnough.vue +++ b/manager/src/views/lili-floor-renovation/modelList/notEnough.vue @@ -108,7 +108,10 @@ export default { }, handleSelectGoods(item) { // 调起选择链接弹窗 if(item) this.selected = item; - this.$refs.liliDialog.open('goods') + this.$refs.liliDialog.open('goods', 'single') + setTimeout(() => { + this.$refs.liliDialog.goodsData = [this.selected] + }, 500); }, selectedLink(val) { this.selected.url = this.$options.filters.formatLinkType(val); diff --git a/manager/src/views/lili-floor-renovation/modelList/recommend.vue b/manager/src/views/lili-floor-renovation/modelList/recommend.vue index 588709dc..d37a34a2 100644 --- a/manager/src/views/lili-floor-renovation/modelList/recommend.vue +++ b/manager/src/views/lili-floor-renovation/modelList/recommend.vue @@ -241,7 +241,7 @@ export default { }, handleSelectGoods(item) { // 调起选择商品 - this.$refs.liliDialog.open("goods"); + this.$refs.liliDialog.open('goods', 'single') }, selectedLink(val) { this.selected.url = this.$options.filters.formatLinkType(val); diff --git a/manager/src/views/order/flow/refundLog.vue b/manager/src/views/order/flow/refundLog.vue index 3b99a5fd..8e60beaf 100644 --- a/manager/src/views/order/flow/refundLog.vue +++ b/manager/src/views/order/flow/refundLog.vue @@ -57,14 +57,6 @@ export default { isRefund: "", }, selectDate: null, - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, columns: [ { title: "售后单号", diff --git a/manager/src/views/order/order/fictitiousOrderList.vue b/manager/src/views/order/order/fictitiousOrderList.vue index 50387891..5256a2cb 100644 --- a/manager/src/views/order/order/fictitiousOrderList.vue +++ b/manager/src/views/order/order/fictitiousOrderList.vue @@ -106,16 +106,6 @@ orderStatus: "" }, selectDate: null, // 下单时间 - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, - // 表单验证规则 - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue index 545b8ed6..2005fe73 100644 --- a/manager/src/views/order/order/orderDetail.vue +++ b/manager/src/views/order/order/orderDetail.vue @@ -212,7 +212,7 @@
  • 应付金额： ¥{{ orderInfo.order.priceDetailDTO.flowPrice }}¥{{ orderInfo.order.priceDetailDTO.flowPrice | unitPrice }}
    • diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue index a36f93c8..beda900e 100644 --- a/manager/src/views/order/order/orderList.vue +++ b/manager/src/views/order/order/orderList.vue @@ -64,16 +64,6 @@ export default { orderStatus: "", }, selectDate: null, - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, - // 表单验证规则 - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 diff --git a/manager/src/views/order/receipt/receipt.vue b/manager/src/views/order/receipt/receipt.vue index 52f36e32..1018b8a5 100644 --- a/manager/src/views/order/receipt/receipt.vue +++ b/manager/src/views/order/receipt/receipt.vue @@ -114,20 +114,10 @@ receiptStatus: "", // 起始时间 }, shopsData: [], // 店铺数据 - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, params: { pageNumber: 1, - pageSize: 1, + pageSize: 10, }, - // 表单验证规则 - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 diff --git a/manager/src/views/promotion/coupon/couponPublish.vue b/manager/src/views/promotion/coupon/couponPublish.vue index cc017088..07102b18 100644 --- a/manager/src/views/promotion/coupon/couponPublish.vue +++ b/manager/src/views/promotion/coupon/couponPublish.vue @@ -70,7 +70,7 @@
    - +
    @@ -392,6 +392,14 @@ export default { ); this.$router.go(-1); }, + openSkuList() { // 显示商品选择器 + this.$refs.skuSelect.open("goods"); + let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList)) + data.forEach(e => { + e.id = e.skuId + }) + this.$refs.skuSelect.goodsData = data; + }, changeSelect(e) { // 已选商品批量选择 this.selectedGoods = e; @@ -424,25 +432,19 @@ export default { }, selectedGoodsData(item) { // 回显已选商品 - let ids = []; let list = []; - this.form.promotionGoodsList.forEach((e) => { - ids.push(e.skuId); - }); item.forEach((e) => { - if (!ids.includes(e.id)) { list.push({ goodsName: e.goodsName, price: e.price, originalPrice: e.price, quantity: e.quantity, storeId: e.storeId, - sellerName: e.sellerName, + storeName: e.storeName, skuId: e.id, }); - } }); - this.form.promotionGoodsList.push(...list); + this.form.promotionGoodsList = list; }, getGoodsCategory(e) { // 获取级联选择器商品分类id diff --git a/manager/src/views/promotion/pointsGoods/editPointsGoods.vue b/manager/src/views/promotion/pointsGoods/editPointsGoods.vue index d8646b58..082b27ac 100644 --- a/manager/src/views/promotion/pointsGoods/editPointsGoods.vue +++ b/manager/src/views/promotion/pointsGoods/editPointsGoods.vue @@ -5,19 +5,19 @@

    积分商品信息

    - +
    {{ form.goodsSku.goodsName }}
     - +
    {{ form.goodsSku.id }}
     - -
    {{ form.goodsSku.sellerName }}
    + +
    {{ form.goodsSku.storeName }}
     - +
    {{ form.goodsSku.price | unitPrice('￥') }}
     - +
    {{ form.goodsSku.quantity }}
     @@ -90,9 +90,7 @@
    - + - -
    -
    @@ -65,9 +39,6 @@ export default { data() { return { loading: true, // 表单加载状态 - modalType: 0, // 添加或编辑标识 - modalVisible: false, // 添加或编辑显示 - modalTitle: "", // 添加或编辑标题 searchForm: { // 搜索框初始化对象 pageNumber: 1, // 当前页数 @@ -78,17 +49,6 @@ export default { endDate: "", // 终止时间 }, selectDate: null, // 选择一个事件段 - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, - // 表单验证规则 - formValidate: {}, - submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 columns: [ @@ -227,8 +187,6 @@ export default { getDataList() { this.loading = true; - // this.searchForm - this.searchForm.startTime && (this.searchForm.startTime = this.$options.filters.unixToDate( this.searchForm.startTime / 1000 @@ -248,35 +206,6 @@ export default { this.total = this.data.length; this.loading = false; }, - handleSubmit() { - this.$refs.form.validate((valid) => { - if (valid) { - this.submitLoading = true; - if (this.modalType === 0) { - // 添加 避免编辑后传入id等数据 记得删除 - delete this.form.id; - this.postRequest("/bill/insertOrUpdate", this.form).then((res) => { - this.submitLoading = false; - if (res.success) { - this.$Message.success("操作成功"); - this.getDataList(); - this.modalVisible = false; - } - }); - } else { - // 编辑 - this.postRequest("/bill/insertOrUpdate", this.form).then((res) => { - this.submitLoading = false; - if (res.success) { - this.$Message.success("操作成功"); - this.getDataList(); - this.modalVisible = false; - } - }); - } - } - }); - }, detail(v) { let id = v.id; this.$router.push({ diff --git a/manager/src/views/seller/bill/bill.vue b/manager/src/views/seller/bill/bill.vue index d014ce8e..2a4f5b3c 100644 --- a/manager/src/views/seller/bill/bill.vue +++ b/manager/src/views/seller/bill/bill.vue @@ -24,11 +24,10 @@ - -
    +
    @@ -38,32 +37,6 @@ - -
    - - - - - - - - - - - - - - - - - -
    -
    - - -
    -     @@ -76,9 +49,6 @@ export default { data() { return { loading: true, // 表单加载状态 - modalType: 0, // 添加或编辑标识 - modalVisible: false, // 添加或编辑显示 - modalTitle: "", // 添加或编辑标题 searchForm: { // 搜索框初始化对象 pageNumber: 1, // 当前页数 @@ -90,17 +60,6 @@ export default { billStatus:"" //状态 }, selectDate: null, // 选择一个时间段 - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, - // 表单验证规则 - formValidate: {}, - submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 columns: [ @@ -201,28 +160,20 @@ export default { init() { this.getDataList(); }, - changePage(v) { + changePage(v) { // 改变页码 this.searchForm.pageNumber = v; this.getDataList(); }, - changePageSize(v) { + changePageSize(v) { // 改变页数 this.searchForm.pageSize = v; this.getDataList(); }, - handleSearch() { + handleSearch() { // 搜索 this.searchForm.pageNumber = 1; this.searchForm.pageSize = 10; this.getDataList(); }, - changeSort(e) { - this.searchForm.sort = e.key; - this.searchForm.order = e.order; - if (e.order === "normal") { - this.searchForm.order = ""; - } - this.getDataList(); - }, - changeSelect(e) { + changeSelect(e) { // 表格选中 this.selectList = e; this.selectCount = e.length; }, @@ -235,8 +186,6 @@ export default { getDataList() { this.loading = true; - // this.searchForm - this.searchForm.startTime && (this.searchForm.startTime = this.$options.filters.unixToDate( this.searchForm.startTime / 1000 @@ -256,43 +205,7 @@ export default { this.total = this.data.length; this.loading = false; }, - handleSubmit() { - this.$refs.form.validate((valid) => { - if (valid) { - this.submitLoading = true; - if (this.modalType === 0) { - // 添加 避免编辑后传入id等数据 记得删除 - delete this.form.id; - this.postRequest("/bill/insertOrUpdate", this.form).then((res) => { - this.submitLoading = false; - if (res.success) { - this.$Message.success("操作成功"); - this.getDataList(); - this.modalVisible = false; - } - }); - } else { - // 编辑 - this.postRequest("/bill/insertOrUpdate", this.form).then((res) => { - this.submitLoading = false; - if (res.success) { - this.$Message.success("操作成功"); - this.getDataList(); - this.modalVisible = false; - } - }); - } - } - }); - }, - add() { - this.modalType = 0; - this.modalTitle = "添加"; - this.$refs.form.resetFields(); - delete this.form.id; - this.modalVisible = true; - }, - detail(v) { + detail(v) { // 账单详情 let id = v.id; this.$router.push({ name: "bill-detail", @@ -314,14 +227,10 @@ export default { this.getDataList(); } }); - // 模拟请求成功 - //this.$Message.success("操作成功"); - //this.$Modal.remove(); - //this.getDataList(); }, }); }, - delAll() { + delAll() { // 多选删除数据 if (this.selectCount <= 0) { this.$Message.warning("您还未选择要删除的数据"); return; diff --git a/manager/src/views/statistics/order.vue b/manager/src/views/statistics/order.vue index 5c56535a..308af93e 100644 --- a/manager/src/views/statistics/order.vue +++ b/manager/src/views/statistics/order.vue @@ -305,7 +305,7 @@ export default { }, { title: "商家名称", - key: "sellerName", + key: "storeName", }, { title: "售后单类型", diff --git a/manager/src/views/statistics/order/refundOrder.vue b/manager/src/views/statistics/order/refundOrder.vue index 6e37b7fe..65753284 100644 --- a/manager/src/views/statistics/order/refundOrder.vue +++ b/manager/src/views/statistics/order/refundOrder.vue @@ -38,7 +38,7 @@
    店铺名称 - {{res.sellerName}} + {{res.storeName}}
    创建时间 From 978db4e6248c2cacb0a7eeb072c5a24e0784ff96 Mon Sep 17 00:00:00 2001 From: mabo Date: Tue, 25 May 2021 18:37:29 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E9=85=8D=E9=80=81=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/seller/shop/shopOperation.vue | 8 +++++ seller/src/views/goods/goods-seller/goods.vue | 2 +- .../goods/goods-seller/goodsOperation.vue | 32 ++++++++--------- seller/src/views/shop/ship/shipTemplate.vue | 35 ++++++++----------- 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/manager/src/views/seller/shop/shopOperation.vue b/manager/src/views/seller/shop/shopOperation.vue index e3db7ae4..61206931 100644 --- a/manager/src/views/seller/shop/shopOperation.vue +++ b/manager/src/views/seller/shop/shopOperation.vue @@ -65,9 +65,17 @@ + 腾讯云智服 + + + + + +
    +
    只读不可修改
    diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue index 165f9944..69362191 100644 --- a/seller/src/views/goods/goods-seller/goods.vue +++ b/seller/src/views/goods/goods-seller/goods.vue @@ -31,7 +31,7 @@ 批量上架 批量下架 批量删除 - 批量设置运费模板 + diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue index 24b6be3f..58204d99 100644 --- a/seller/src/views/goods/goods-seller/goodsOperation.vue +++ b/seller/src/views/goods/goods-seller/goodsOperation.vue @@ -522,7 +522,7 @@ kg     - + { - if (res.success) { - this.logisticsTemplate = res.result; - } - }); - this.logisticsTemplateShow = true; - } + // if (this.baseInfoForm.freightPayer === "BUYER") { + // API_Shop.getShipTemplate().then((res) => { + // if (res.success) { + // this.logisticsTemplate = res.result; + // } + // }); + // this.logisticsTemplateShow = true; + // } this.baseInfoForm.release = "true"; this.baseInfoForm.recommend = this.baseInfoForm.recommend ? "true" @@ -1840,9 +1840,9 @@ export default { return; } //如果选择的是卖家承担运费 则运费模板重置为0 - if (this.baseInfoForm.freightPayer !== "BUYER") { - this.baseInfoForm.templateId = 0; - } + // if (this.baseInfoForm.freightPayer !== "BUYER") { + // this.baseInfoForm.templateId = 0; + // } this.baseInfoForm.skuList = this.skuTableData.map((sku) => { delete sku._index; diff --git a/seller/src/views/shop/ship/shipTemplate.vue b/seller/src/views/shop/ship/shipTemplate.vue index e86405e8..9e002f58 100644 --- a/seller/src/views/shop/ship/shipTemplate.vue +++ b/seller/src/views/shop/ship/shipTemplate.vue @@ -69,9 +69,10 @@ 按重量 按件数 + 包邮 - +
    @@ -101,17 +102,17 @@ - - 元 - + + 元 + - - 元 - + + 元 +
    - @@ -312,6 +313,7 @@ export default { const regNumber = /^\+?[1-9][0-9]*$/; const regMoney = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/; if (valid) { + debugger; //校验运费模板详细信息 for (let i = 0; i < this.form.freightTemplateChildList.length; i++) { if ( @@ -341,6 +343,8 @@ export default { return; } } + console.log(1111); + if (this.operation == "ADD") { API_Shop.addShipTemplate(this.form, headers).then((res) => { if (res.success) { @@ -541,7 +545,8 @@ textarea { } .w60 { - width: 80px !important; + width: 100px !important; + margin: 0 auto; } Input[type="text"], @@ -555,18 +560,6 @@ Input.password { outline: 0 none; } -.add-on { - line-height: 28px; - background-color: #f6f7fb; - vertical-align: top; - display: inline-block; - text-align: center; - width: 30px; - height: 30px; - border: solid #e6e9ee; - border-width: 1px 1px 1px 0; -} - ncsc-default-table { line-height: 20px; width: 100%; From ff85c3f68fd9b8085ae7d3cf13482837ec8f6f4e Mon Sep 17 00:00:00 2001 From: mabo Date: Tue, 25 May 2021 18:58:55 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/src/views/shop/ship/shipTemplate.vue | 317 ++++++++++---------- 1 file changed, 158 insertions(+), 159 deletions(-) diff --git a/seller/src/views/shop/ship/shipTemplate.vue b/seller/src/views/shop/ship/shipTemplate.vue index 9e002f58..a1f22716 100644 --- a/seller/src/views/shop/ship/shipTemplate.vue +++ b/seller/src/views/shop/ship/shipTemplate.vue @@ -1,45 +1,43 @@ diff --git a/manager/src/views/seller/bill/bill-detail.vue b/manager/src/views/seller/bill/bill-detail.vue index f5bbad04..00c86956 100644 --- a/manager/src/views/seller/bill/bill-detail.vue +++ b/manager/src/views/seller/bill/bill-detail.vue @@ -48,15 +48,13 @@ - -
    -     +
    - -
    -     +
    - - - - -
    - - - - - - - - - - - -
    -     - - - - - -
    -     - - - -     - -     + + +
    + + + + + + + + + + + +
    +     + + + + +
    + + + +
    diff --git a/manager/src/views/seller/shop/shopAuditList.vue b/manager/src/views/seller/shop/shopAuditList.vue index 701f5f30..2101d6c7 100644 --- a/manager/src/views/seller/shop/shopAuditList.vue +++ b/manager/src/views/seller/shop/shopAuditList.vue @@ -1,44 +1,38 @@ diff --git a/manager/src/views/seller/shop/shopDetail.vue b/manager/src/views/seller/shop/shopDetail.vue index 3737568d..ab3cb70a 100644 --- a/manager/src/views/seller/shop/shopDetail.vue +++ b/manager/src/views/seller/shop/shopDetail.vue @@ -246,22 +246,20 @@
    - - - - -
    -     + + + +
    - - - - - - -
    -     + + + + + +
    - - - - - - -
    -     + + + + + +
    - - - - -
    - - - - - - - - - - - - - -
    -     - - - - -
    -     - - - -     - -     + + +
    + + + + + + + + + + + + + +
    +     + + + +
    + + + +
    diff --git a/manager/src/views/sensitiveWords/index.vue b/manager/src/views/sensitiveWords/index.vue index dba70f7f..beb50ee4 100644 --- a/manager/src/views/sensitiveWords/index.vue +++ b/manager/src/views/sensitiveWords/index.vue @@ -1,41 +1,35 @@ diff --git a/seller/src/views/goods/goods-seller/draftGoods.vue b/seller/src/views/goods/goods-seller/draftGoods.vue index 5b7e6b91..fdd63905 100644 --- a/seller/src/views/goods/goods-seller/draftGoods.vue +++ b/seller/src/views/goods/goods-seller/draftGoods.vue @@ -1,88 +1,82 @@ diff --git a/seller/src/views/order/after-order/returnMoneyOrder.vue b/seller/src/views/order/after-order/returnMoneyOrder.vue index 66db4536..cc41f994 100644 --- a/seller/src/views/order/after-order/returnMoneyOrder.vue +++ b/seller/src/views/order/after-order/returnMoneyOrder.vue @@ -1,105 +1,99 @@ diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue index 38dd451c..cfda0899 100644 --- a/seller/src/views/order/order/orderDetail.vue +++ b/seller/src/views/order/order/orderDetail.vue @@ -1,179 +1,173 @@ diff --git a/seller/src/views/shop/bill/billDetail.vue b/seller/src/views/shop/bill/billDetail.vue index d30a8a41..d513fb03 100644 --- a/seller/src/views/shop/bill/billDetail.vue +++ b/seller/src/views/shop/bill/billDetail.vue @@ -47,15 +47,13 @@ - -
    -     +
    - -
    -     +
    - -
    -     +
    重置 - -
    -     +
    - - - - -
    -     - -     - -     - + +
    +
    diff --git a/seller/src/views/shop/shopAddress.vue b/seller/src/views/shop/shopAddress.vue index 13cbe0f4..707a635c 100644 --- a/seller/src/views/shop/shopAddress.vue +++ b/seller/src/views/shop/shopAddress.vue @@ -7,17 +7,15 @@ - -
    -     +
    -
    diff --git a/seller/src/views/statistics/order/orderStatistics.vue b/seller/src/views/statistics/order/orderStatistics.vue index 2330a69d..642bdb22 100644 --- a/seller/src/views/statistics/order/orderStatistics.vue +++ b/seller/src/views/statistics/order/orderStatistics.vue @@ -59,17 +59,14 @@ - - - -
    -     + +
    Date: Fri, 28 May 2021 17:26:15 +0800 Subject: [PATCH 10/10] =?UTF-8?q?tab=E6=A0=8F=E5=88=86=E7=B1=BB=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E9=97=AA=E7=83=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/components/nav/cateNav.vue | 75 +++++++++++++--------------- 1 file changed, 35 insertions(+), 40 deletions(-) diff --git a/buyer/src/components/nav/cateNav.vue b/buyer/src/components/nav/cateNav.vue index 9cdd66c6..e4fd092c 100644 --- a/buyer/src/components/nav/cateNav.vue +++ b/buyer/src/components/nav/cateNav.vue @@ -13,11 +13,12 @@
    - +
    -
    + +
      -
    • +
    • {{item.name}} / @@ -26,38 +27,35 @@
    - -
    -
    - -
    -
      -
    • - - {{ items.name }} - - -
      - {{ item.name }} -
      -
      • -
    + +
    +
    +
    - +
      +
    • + + {{ items.name }} + + +
      + {{ item.name }} +
      +
      • +
    +
    @@ -86,12 +84,12 @@ export default { } }, computed: { - navList () { + navList () { // 导航列表 return JSON.parse(storage.getItem('navList')) || [] } }, methods: { - getCate () { + getCate () { // 获取分类数据 getCategory(0).then(res => { if (res.success) { this.cateList = res.result; @@ -99,7 +97,7 @@ export default { } }); }, - showDetail (index) { + showDetail (index) { // 展示全部分类 this.panel = true this.panelData = this.cateList[index].children }, @@ -245,9 +243,6 @@ export default { .nav-detail-item span:hover { background-color: $theme_color; } -.detail-item-panel ul { - list-style: none; -} .detail-item-panel li { line-height: 30px; // margin-left: 40px;