From ebc79da0fccfcb86ae5d3e06dda42925d90aba27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?= <17633066053@163.com> Date: Wed, 12 Apr 2023 11:06:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20:sparkles:=20=E5=AF=B9=E5=8E=9F?= =?UTF-8?q?=E6=9C=89=E5=A1=AB=E5=86=99=E9=87=91=E9=A2=9D=E7=9A=84input?= =?UTF-8?q?=E6=A1=86=E8=BF=9B=E8=A1=8C=E6=94=B9=E8=BF=9B=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/lili/upload-pic-input.vue | 6 +++--- manager/src/views/member/list/index.vue | 1 + .../after-order/afterSaleOrderDetail.vue | 2 +- .../points-goods/points-goods-add.vue | 19 ++++++++++++++----- .../points-goods/points-goods-edit.vue | 5 +++-- .../after-order/reurnGoodsOrderDetail.vue | 2 +- 6 files changed, 23 insertions(+), 12 deletions(-) diff --git a/manager/src/components/lili/upload-pic-input.vue b/manager/src/components/lili/upload-pic-input.vue index 6ad5bddf..e5039617 100644 --- a/manager/src/components/lili/upload-pic-input.vue +++ b/manager/src/components/lili/upload-pic-input.vue @@ -14,12 +14,12 @@
- 该资源不存在 + 该资源不存在 查看大图
- + - 该资源不存在 + 该资源不存在
diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue index 0f0ad381..04890d8c 100644 --- a/manager/src/views/member/list/index.vue +++ b/manager/src/views/member/list/index.vue @@ -325,6 +325,7 @@ export default { methods: { // 回调给父级 callback(val, index) { + this.selectMember.forEach(item=>{item.___selected = false}) this.$set(val, "___selected", !val.___selected); console.log(val.___selected); console.log(this.selectMember); diff --git a/manager/src/views/order/after-order/afterSaleOrderDetail.vue b/manager/src/views/order/after-order/afterSaleOrderDetail.vue index a4a5edda..122bfd22 100644 --- a/manager/src/views/order/after-order/afterSaleOrderDetail.vue +++ b/manager/src/views/order/after-order/afterSaleOrderDetail.vue @@ -84,7 +84,7 @@
实际退款金额
- +
diff --git a/manager/src/views/promotions/points-goods/points-goods-add.vue b/manager/src/views/promotions/points-goods/points-goods-add.vue index 9d4380ab..6434484e 100644 --- a/manager/src/views/promotions/points-goods/points-goods-add.vue +++ b/manager/src/views/promotions/points-goods/points-goods-add.vue @@ -28,7 +28,8 @@ @@ -370,8 +379,8 @@ export default { settlementPrice: e.settlementPrice || 0, pointsGoodsCategoryId: e.pointsGoodsCategoryId || 0, pointsGoodsCategoryName: e.pointsGoodsCategoryName || "", - activeStock: e.activeStock || 0, - points: e.points || 0, + activeStock: e.activeStock || 1, + points: e.points || 1, skuId: e.id, goodsId: e.goodsId, originalPrice: e.price || 0, diff --git a/manager/src/views/promotions/points-goods/points-goods-edit.vue b/manager/src/views/promotions/points-goods/points-goods-edit.vue index b8fd1c7c..6604fc0e 100644 --- a/manager/src/views/promotions/points-goods/points-goods-edit.vue +++ b/manager/src/views/promotions/points-goods/points-goods-edit.vue @@ -96,7 +96,7 @@ export default { pointsGoodsCategoryId:'', pointsGoodsCategoryName:'', form: { - + /** 活动名称 */ promotionName: "", /** 报名截止时间 */ @@ -109,7 +109,7 @@ export default { seckillRule: "", goodsSku: {}, promotionStatus: "NEW", - + }, categoryList: [], // 分类列表 id: this.$route.query.id, // 活动id @@ -118,6 +118,7 @@ export default { settlementPrice: [{ required: true, message: "请填写结算价格" }], pointsGoodsCategoryId: [{ required: true, message: "请选择积分商品分类" }], points: [{ required: true, message: "请填写兑换积分" }], + activeStock: [{ required: true, message: "请填写库存" }], }, options: { disabledDate(date) { diff --git a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue index df8db5bb..cbf57bbc 100644 --- a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue +++ b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue @@ -94,7 +94,7 @@
实际退款金额
- +