瀏覽代碼

no message

py 1 年之前
父節點
當前提交
9fa997b78d

+ 5 - 7
pages-buy/group-refund.vue

@@ -15,7 +15,7 @@
 							退款数量
 						</view>
 						<view class="fs-24 fc-9">
-							最多可退 {{(Number(this.goods_info.goods_number) - Number(this.goods_info.finish_number))}} 张
+							最多可退 {{(Number(this.goods_info.goods_number) - Number(this.goods_info.finish_number) - Number(this.goods_info.refund_number))}} 张
 						</view>
 					</view>
 					<view class="align-items-center">
@@ -170,10 +170,9 @@
 				this.$refs.popup.close()
 			},
 			blur() {
-				if (this.fromData.number >= (Number(this.goods_info.goods_number) - Number(this.goods_info
-						.finish_number))) {
-					tools.error('退款数量最大为' + (Number(this.goods_info.goods_number) - Number(this.goods_info.finish_number)))
-					this.fromData.number = (Number(this.goods_info.goods_number) - Number(this.goods_info.finish_number))
+				if (this.fromData.number >= (Number(this.goods_info.goods_number) - Number(this.goods_info.finish_number) - Number(this.goods_info.refund_number))) {
+					tools.error('退款数量最大为' + (Number(this.goods_info.goods_number) - Number(this.goods_info.finish_number) - Number(this.goods_info.refund_number)))
+					this.fromData.number = (Number(this.goods_info.goods_number) - Number(this.goods_info.finish_number) - Number(this.goods_info.refund_number))
 				} else if (this.fromData.number <= 0) {
 					tools.error('退款数量最少为1')
 					this.fromData.number = 1
@@ -189,8 +188,7 @@
 					--this.fromData.number
 				} else {
 					// 加
-					if (this.fromData.number >= (Number(this.goods_info.goods_number) - Number(this.goods_info
-							.finish_number))) {
+					if (this.fromData.number >= (Number(this.goods_info.goods_number) - Number(this.goods_info.finish_number) - Number(this.goods_info.refund_number))) {
 						tools.error('退款数量已是最大值')
 						return
 					}

+ 1 - 1
pages-my/appraise.vue

@@ -210,7 +210,7 @@
 		height: 200rpx;
 	}
 	.textarea{
-		height: 200rpx;
+		height: 180rpx !important;
 	}
 
 	.up-img {

+ 9 - 0
pages-order/express-info.vue

@@ -175,6 +175,15 @@
 						{{infoData.rider.rider_name?infoData.rider.rider_name:'无'}}{{infoData.rider.phone}}
 					</view>
 				</view>
+				<view class="display-flex flex-justify-space pb-20 b-b-F9F9F9 mb-26"
+					v-show="infoData.order_status == 5">
+					<view class="fs-28 fc-9">
+						退款金额
+					</view>
+					<view class="fs-28 fc-3 w-480 text-align-right">
+						{{infoData.refund_money?infoData.refund_money:'无'}}
+					</view>
+				</view>
 				<view class="display-flex flex-justify-space pb-20 b-b-F9F9F9 mb-26"
 					v-show="infoData.order_status == 5">
 					<view class="fs-28 fc-9">

+ 1 - 1
pages-order/run-errands-info.vue

@@ -82,7 +82,7 @@
 						送达地址
 					</view>
 					<view class="fs-28 fc-3">
-						{{infoData.address>0?infoData.school_name + infoData.dorm_name + infoData.address:'无'}}
+						{{infoData.address_id>0?infoData.school_name + infoData.dorm_name + infoData.address:'无'}}
 					</view>
 				</view>
 				<view class="align-items-center flex-justify-space mb-24">

+ 1 - 0
pages/chat/index.vue

@@ -65,6 +65,7 @@
 			this.page = 1
 			this.scrollTop = 20
 			this.chatData = []
+			this.sendControl = true
 			this.aiMsgList()
 		},
 		onLoad() {},

+ 1 - 1
pages/order/index.vue

@@ -307,7 +307,7 @@
 				this.selectType(orderPayType)
 				console.log('固定type');
 			} else if (orderInfoType) {
-
+				this.resetList();
 			} else {
 				this.resetList();
 			}