11

pages/index/orderDetail.vue

@@ -20,6 +20,7 @@
 						<view class="shop-collapse"  v-for="(item1,index1) in item.stockLogList1" :key='index1'>
 							<text>{{item1.attributeList | sliceMsg}}</text>
 							<text>数量：{{item1.productCount}}</text>
+							<!-- <u-number-box integer v-if="isReturn" :max="item1.productCount - " :min="0" -->
 							<u-number-box integer v-if="isReturn" :max="item1.productCount" :min="0"
 								v-model="item1.returnCount"></u-number-box>
 						</view>
@@ -72,8 +73,9 @@
 				<view class="tui-price-flex tui-size32" v-if="isReturn">
 					<view class="tui-flex-shrink">已选金额</view>
 					<view class="tui-goods-price">
-						<view class="tui-size-24">￥</view>
+						<view class="tui-size-24">￥</view>
-						<view class="tui-price-large">{{ changeAmount}}</view>
+						<input type="digit" style="width: 150rpx;text-align: right;border-bottom: 1px solid #eee;" v-model='changeAmount'>
+						<!-- <view class="tui-price-large">{{ changeAmount}}</view> -->
 					</view>
 				</view>
 				<view class="tui-price-flex tui-size32" v-if="isReturn">
@@ -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.length;i++){
+				// 	this.inventoryList.forEach(item => {
+				// 		this.list[i].returnCount = this.list[i].productCount - item.productCount
+				// 	})
+				// }
+				
 				if (this.isReturn) {
 					this.sureReturn()
 				} else {

pages/index/shareStyle.vue

@@ -65,6 +65,20 @@
 		<!-- 分享弹出层 -->
 		<uni-popup ref="share" type="share" @select='select' safeArea backgroundColor="#fff">
 			<uni-popup-share></uni-popup-share>
+		</uni-popup>
+		<!-- 弹出输入框 -->
+		<uni-popup ref="payDialog" background-color="#fff">
+			<view class="popup-pay-content">
+				<view class="popup-pay-title">
+					<text>选择商品价格</text>
+				</view>
+				<view class="popup-pay-container" @tap="checkPay('1')">
+					<text style="display: inline-block">以零售价分享</text>
+				</view>
+				<view class="popup-pay-container" @tap="checkPay('0')">
+					<text style="display: inline-block">以批发价分享</text>
+				</view>
+			</view>
 		</uni-popup>
 		<!-- 购物车弹出层 -->
 		<uni-popup ref="carPopup" background-color="#fff">
@@ -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.khid = res.result.id
-						this.$refs.share.open()
+						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;
 	}
 </style>