幸福存折

pages/jiuzhai/jz_LineDetail.vue

@@ -2098,7 +2098,6 @@
 				// #ifdef MP-AG
 					if(this.createBy>0||this.parametersMsg.SaleId) createBy = this.createBy>0?this.createBy:this.parametersMsg.SaleId
 				// #endif
-				console.log("createBy-------",createBy)
 				let tParams = "&tcid=" +
 					this.delMsg.tcid +
 					"&cityId=" +

pages/jiuzhai/jz_Reserve.vue

@@ -392,10 +392,12 @@
 					<view style="display: flex;align-items: center;">
 						<text style="color:#F20707;font-size: 12px;">
 							<text class="content" :style="{ color: mainColor }">余额 {{ happinessPassbook.client_Balance-happinessPassbook.RedEnvelopeMoney}} 元</text>
-							<text class="content" style="color:grey;margin-left: 10rpx;" v-if="happinessPassbook.max>0">最多可减 {{ happinessPassbook.max }}元</text>
+							
 						</text>
 					</view>
+					
 				</view>
+				<!-- <text class="content" style="color:#F20707;font-size: 24rpx;" v-if="happinessPassbook.max >0">一次最多可减 {{ happinessPassbook.max>happinessPassbook.client_Balance?happinessPassbook.client_Balance:happinessPassbook.max }}元</text> -->
 			</view>
 		</template>
 		<view class="empty-block"></view>
@@ -707,7 +709,22 @@
 				);
 			},
 			ChangeUse(e) {
-				if(e.value>0) this.happinessPassbook.RedEnvelopeMoney = e.value;
+				if((e.value>=this.happinessPassbook.max&&this.happinessPassbook.max>this.happinessPassbook.client_Balance)||
+				(e.value>this.happinessPassbook.client_Balance)){
+					uni.showToast({
+						title: `本单最多可减${this.happinessPassbook.client_Balance}元`,
+						icon:'none'
+					})
+					this.happinessPassbook.RedEnvelopeMoney = this.happinessPassbook.client_Balance
+					return
+				}else if(e.value>=this.happinessPassbook.max&&this.happinessPassbook.max<=this.happinessPassbook.client_Balance){
+					uni.showToast({
+						title: `本单最多可减${this.happinessPassbook.max}元`,
+						icon:'none'
+					})
+					this.happinessPassbook.RedEnvelopeMoney = this.happinessPassbook.max
+					return
+				}else if(e.value>0) this.happinessPassbook.RedEnvelopeMoney = e.value;
 				else this.happinessPassbook.RedEnvelopeMoney = 0;
 			},
 			navigatorToHomeHandle() {

pages/jiuzhai/jz_SureOrder.vue

@@ -544,7 +544,7 @@
 						<text style="margin-right: 30rpx">合计应收</text>
 					</view>
 					<view style="text-align: right;color: #ff3166;font-size:32rpx;font-weight: bold;">
-						{{(orderData.model.PreferPrice-orderData.model.DiscountMoney).toFixed(2)}}
+						{{(orderData.model.PreferPrice-orderData.model.DiscountMoney-orderData.model.RedEnvelopeMoney).toFixed(2)}}
 					</view>
 				</view>
 			</view>