diff --git a/pages/index/orderDetail.vue b/pages/index/orderDetail.vue index 62c5732..7f3a8f3 100644 --- a/pages/index/orderDetail.vue +++ b/pages/index/orderDetail.vue @@ -20,6 +20,7 @@ {{item1.attributeList | sliceMsg}} 数量:{{item1.productCount}} + @@ -72,8 +73,9 @@ 已选金额 - ¥ - {{ changeAmount}} + ¥ + + @@ -424,7 +426,6 @@ }, getReturnOrder(id) { this.tui.request("/app/return/list", "post", { - shopId: "1718514268414021633", remark: 3, saleId: id }, false, false).then((res) => { @@ -506,7 +507,13 @@ } }).catch((res) => {}) }, - returnGoods() { + returnGoods() { + // for(let i=0;i { + // this.list[i].returnCount = this.list[i].productCount - item.productCount + // }) + // } + if (this.isReturn) { this.sureReturn() } else { diff --git a/pages/index/shareStyle.vue b/pages/index/shareStyle.vue index c1cbf4f..194832d 100644 --- a/pages/index/shareStyle.vue +++ b/pages/index/shareStyle.vue @@ -65,6 +65,20 @@ + + + + + + 选择商品价格 + + + 以零售价分享 + + + 以批发价分享 + + @@ -118,7 +132,8 @@ carNum: 0, carType: 0, type: '', - gwcList: [] + gwcList: [], + checkPayData:'' } }, created() { @@ -253,8 +268,8 @@ } this.tui.request("/app/productShare/save", "POST", data, false, true).then((res) => { if (res.code == 200) { - this.khid = res.result.id - this.$refs.share.open() + this.khid = res.result.id + this.$refs.payDialog.open() } else { this.tui.toast(res.message) } @@ -318,8 +333,11 @@ } }) - - + }, + checkPay(data){ + this.checkPayData = data + this.$refs.payDialog.close() + this.$refs.share.open() }, //关闭购物车弹窗 closeCar() { @@ -589,5 +607,30 @@ left: 0; background: rgba(0, 0, 0, 0.1); z-index: 99; + } + .popup-pay-content { + align-items: center; + justify-content: center; + padding: 15px; + width: 500rpx; + height: auto; + background-color: #fff; + } + .popup-pay-title { + font-size: 36rpx; + font-weight: bold; + text-align: center; + position: relative; + } + .popup-pay-container { + margin-top: 20rpx; + height: 100rpx; + border-radius: 10px; + background: #088FEB; + line-height: 100rpx; + text-align: center; + border-bottom: 1px solid #eee; + border-top: 1px solid #eee; + color: #fff; } \ No newline at end of file