diff --git a/buyer/src/pages/payment/PayDone.vue b/buyer/src/pages/payment/PayDone.vue index 7f76d562..cc950370 100644 --- a/buyer/src/pages/payment/PayDone.vue +++ b/buyer/src/pages/payment/PayDone.vue @@ -6,7 +6,8 @@
- + +
diff --git a/buyer/src/pages/payment/PayMent.vue b/buyer/src/pages/payment/PayMent.vue index c8bdedf8..2e2cd35e 100644 --- a/buyer/src/pages/payment/PayMent.vue +++ b/buyer/src/pages/payment/PayMent.vue @@ -34,7 +34,7 @@ alt=""> 微信 -
+
余额支付 当前剩余({{ walletValue | unitPrice('¥') }}) diff --git a/buyer/src/pages/payment/thirdPay.vue b/buyer/src/pages/payment/thirdPay.vue index e953892a..470d6afa 100644 --- a/buyer/src/pages/payment/thirdPay.vue +++ b/buyer/src/pages/payment/thirdPay.vue @@ -70,7 +70,7 @@ export default { payCallback(params).then(res => { if (res.result) { clearInterval(this.interval); - this.$router.push('/payDone'); + this.$router.push({path: '/payDone', query: {orderType: this.$route.query.orderType}}); } }); } diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue index 3166560d..abb8bb3f 100644 --- a/seller/src/views/goods/goods-seller/goodsOperation.vue +++ b/seller/src/views/goods/goods-seller/goodsOperation.vue @@ -159,10 +159,10 @@
+ :on-success="handleSuccessGoodsPicture" :format="['jpg', 'jpeg', 'png']" + :on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize" + :before-upload="handleBeforeUploadGoodsPicture" multiple type="drag" :action="uploadFileUrl" + :headers="accessToken" style="display: inline-block;margin-left:10px;">
@@ -183,9 +183,9 @@ + placeholder="请输入规格项名称" + :filter-method="filterMethod" :data="skuData" + @on-change="editSkuItem"> @@ -441,7 +441,7 @@ export default { editor, }, watch: { - selectGoodsType: { + selectGoodsType: { // 选择商品类型 handler(val) { if (val && this.baseInfoForm.goodsType) { this.goodsTypeWay.forEach((item) => {